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