From bd877487a10c59ccab6b0712bb84ec3c428cd8bc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 22 Mar 2024 16:05:50 -0700 Subject: [PATCH] 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": [