Renamed windows variant to windowsservercore

zZHorizonZz · Sep 9, 2024 · d5532b8 · d5532b8
1 parent 48e25c2
commit d5532b8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/22/windows-2019/Dockerfile → 22/windowsservercore-ltsc2019/Dockerfile b/22/windows-2019/Dockerfile → 22/windowsservercore-ltsc2019/Dockerfile
@@ -16,9 +16,9 @@ ENV GPG_VERSION 2.4.5_20240307
 ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc1
 
 RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
-  if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
-  Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
-  gpg --version;
+    if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
+    Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
+    gpg --version;
 
 RUN @( \
       '4ED778F539E3634C779C87C6D7062848A1AB005C', \

diff --git a/22/windows-2019/docker-entrypoint.ps1 → ...servercore-ltsc2019/docker-entrypoint.ps1 b/22/windows-2019/docker-entrypoint.ps1 → ...servercore-ltsc2019/docker-entrypoint.ps1
diff --git a/22/windows-2022/Dockerfile → 22/windowsservercore-ltsc2022/Dockerfile b/22/windows-2022/Dockerfile → 22/windowsservercore-ltsc2022/Dockerfile
@@ -16,9 +16,9 @@ ENV GPG_VERSION 2.4.5_20240307
 ENV GPG_CHECKSUM d2ac821ceacf9409ebcdb42ae330087ada30c732981f00b356f9c2f08fac4dc1
 
 RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
-  if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
-  Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
-  gpg --version;
+    if ((Get-FileHash gpg-installer.exe -Algorithm sha256).Hash -ne $env:GPG_CHECKSUM) { Write-Error 'GPG checksum mismatch' }; \
+    Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
+    gpg --version;
 
 RUN @( \
       '4ED778F539E3634C779C87C6D7062848A1AB005C', \

diff --git a/22/windows-2022/docker-entrypoint.ps1 → ...servercore-ltsc2022/docker-entrypoint.ps1 b/22/windows-2022/docker-entrypoint.ps1 → ...servercore-ltsc2022/docker-entrypoint.ps1
diff --git a/architectures b/architectures
@@ -1,5 +1,5 @@
 bashbrew-arch  variants
-amd64          alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,windows-2019,windows-2022
+amd64          alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,windowsservercore-ltsc2019,windowsservercore-ltsc2022
 arm32v6        alpine3.19,alpine3.20
 arm32v7        alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
 arm64v8        alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim

diff --git a/update.sh b/update.sh
@@ -195,7 +195,7 @@ function update_node_version() {
     fi
 
     if is_windows "${variant}"; then
-      windows_version="${variant#*windows-}"
+      windows_version="${variant#*windowsservercore-ltsc}"
       checksum=$(
         curl -sSL --compressed "https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-win-x64.zip" | cut -d' ' -f1
       )