Added update.sh

Author: zZHorizonZz

22/windows-2019/Dockerfile

@@ -9,7 +9,7 @@ RUN $newPath = ('C:\nodejs;{0}\Yarn\bin;{1}' -f $env:LOCALAPPDATA, $env:PATH); \
 # doing this first to share cache across versions more aggressively
 
 ENV NODE_VERSION 22.7.0
-ENV NODE_SHA256 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
+ENV CHECKSUM 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
 
 RUN $url = ('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
@@ -34,7 +34,7 @@ RUN $url = ('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VE
 	\
 	Write-Host 'Complete.'
 
-ENV YARN_VERSION 1.22.17
+ENV YARN_VERSION 1.22.22
 
 # "It is recommended to install Yarn through the npm package manager" (https://classic.yarnpkg.com/en/docs/install)
 RUN Write-Host 'Installing "yarn" ...'; \
@@ -47,5 +47,5 @@ RUN Write-Host 'Installing "yarn" ...'; \
 
 COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
 ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
-
+	
 CMD [ "node.exe" ]

22/windows-2022/Dockerfile

@@ -9,7 +9,7 @@ RUN $newPath = ('C:\nodejs;{0}\Yarn\bin;{1}' -f $env:LOCALAPPDATA, $env:PATH); \
 # doing this first to share cache across versions more aggressively
 
 ENV NODE_VERSION 22.7.0
-ENV NODE_SHA256 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
+ENV CHECKSUM 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
 
 RUN $url = ('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
@@ -34,7 +34,7 @@ RUN $url = ('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VE
 	\
 	Write-Host 'Complete.'
 
-ENV YARN_VERSION 1.22.17
+ENV YARN_VERSION 1.22.22
 
 # "It is recommended to install Yarn through the npm package manager" (https://classic.yarnpkg.com/en/docs/install)
 RUN Write-Host 'Installing "yarn" ...'; \

Dockerfile-windows.template

@@ -0,0 +1,51 @@
+FROM mcr.microsoft.com/windows/servercore:version
+
+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 = ('C:\nodejs;{0}\Yarn\bin;{1}' -f $env:LOCALAPPDATA, $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 NODE_VERSION 0.0.0
+ENV CHECKSUM CHECKSUM_x64
+
+RUN $url = ('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION); \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	Invoke-WebRequest -Uri $url -OutFile 'node.zip'; \
+	\
+	Write-Host ('Verifying sha256 ({0}) ...' -f $env:NODE_SHA256); \
+	if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) { throw 'SHA256 mismatch' }; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive node.zip -DestinationPath C:\; \
+	\
+	Write-Host 'Renaming ...'; \
+	Rename-Item -Path ('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item node.zip -Force; \
+	\
+	Write-Host 'Verifying ("node --version") ...'; \
+	node --version; \
+	Write-Host 'Verifying ("npm --version") ...'; \
+	npm --version; \
+	\
+	Write-Host 'Complete.'
+
+ENV YARN_VERSION 0.0.0
+
+# "It is recommended to install Yarn through the npm package manager" (https://classic.yarnpkg.com/en/docs/install)
+RUN Write-Host 'Installing "yarn" ...'; \
+	npm install --global ('yarn@{0}' -f $env:YARN_VERSION); \
+	\
+	Write-Host 'Verifying ("yarn --version") ...'; \
+	yarn --version; \
+	\
+	Write-Host 'Complete.'
+
+COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
+ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
+	
+CMD [ "node.exe" ]

architectures

@@ -1,8 +1,8 @@
 bashbrew-arch  variants
-amd64          alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
+amd64          alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,windows-2019,windows-2022
 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
 i386           alpine3.19,alpine3.20
 ppc64le        alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
-s390x          alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim
+s390x          alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim

docker-entrypoint.ps1

@@ -0,0 +1,16 @@
+# Ensure script stops on any error
+$ErrorActionPreference = 'Stop'
+
+# Check if the first argument:
+# 1. Contains a "-"
+# 2. Is NOT a recognized command
+# 3. Is a file that's NOT executable
+if (($args[0] -like '*-') -or  
+    (!(Get-Command $args[0] -ErrorAction SilentlyContinue)) -or
+    (((Test-Path $args[0] -PathType Leaf)) -and -not ((Get-Item $args[0]).Attributes -band 'ReadOnly'))) { 
+    # Prepend 'node' to the argument list
+    $args = @('node') + $args
+}
+
+# Execute the (potentially modified) command
+& $args[0] $args[1..($args.Length-1)]

functions.sh

@@ -193,6 +193,16 @@ function is_debian_slim() {
   return 1
 }
 
+function is_windows() {
+  local variant
+  variant=$1
+  shift
+
+  if [ "${variant}" = "${variant#windows}" ]; then
+    return 1
+  fi
+}
+
 function get_fork_name() {
   local version
   version=$1

update.sh

@@ -5,35 +5,42 @@ set -ue
 function usage() {
   cat << EOF
 
-  Update the node docker images.
+  Update the node Docker images.
 
   Usage:
-    $0 [-s] [MAJOR_VERSION(S)] [VARIANT(S)]
+    $0 [-s] [-w] [MAJOR_VERSION(S)] [VARIANT(S)]
 
   Examples:
-    - update.sh                      # Update all images
-    - update.sh -s                   # Update all images, skip updating Alpine and Yarn
-    - update.sh 8,10                 # Update all variants of version 8 and 10
-    - update.sh -s 8                 # Update version 8 and variants, skip updating Alpine and Yarn
-    - update.sh 8 alpine             # Update only alpine's variants for version 8
-    - update.sh -s 8 bullseye        # Update only bullseye variant for version 8, skip updating Alpine and Yarn
-    - update.sh . alpine             # Update the alpine variant for all versions
+    - update.sh                       # Update all images
+    - update.sh -s                    # Update all images, skip updating Alpine and Yarn
+    - update.sh -w                    # Update only Windows images
+    - update.sh 8,10                  # Update all variants of version 8 and 10
+    - update.sh -s 8                  # Update version 8 and variants, skip updating Alpine and Yarn
+    - update.sh 8 alpine              # Update only Alpine variants for version 8
+    - update.sh -w 8 windows-2022     # Update only Windows 2022 variant for version 8
+    - update.sh . alpine              # Update the Alpine variant for all versions
 
   OPTIONS:
-    -s Security update; skip updating the yarn and alpine versions.
+    -s Security update; skip updating the Yarn and Alpine versions.
+    -w Windows images update only
     -b CI config update only
     -h Show this message
 
 EOF
 }
 
 SKIP=false
-while getopts "sh" opt; do
+WINDOWS_ONLY=false
+while getopts "swh" opt; do
   case "${opt}" in
     s)
       SKIP=true
       shift
       ;;
+    w)
+      WINDOWS_ONLY=true
+      shift
+      ;;
     h)
       usage
       exit
@@ -167,6 +174,17 @@ function update_node_version() {
       sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"
     elif is_debian_slim "${variant}"; then
       sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp"
+    elif is_windows "${variant}"; then
+      windows_version="${variant#*windows-}"
+      checksum=$(
+        curl -sSL --compressed "https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-win-x64.zip" | cut -d' ' -f1
+      )
+      if [ -z "$checksum" ]; then
+        rm -f "${dockerfile}-tmp"
+        fatal "Failed to fetch checksum for version ${nodeVersion}"
+      fi
+      sed -Ei -e "s/mcr\.microsoft\.com\/windows\/servercore:version/mcr\.microsoft\.com\/windows\/servercore:ltsc${windows_version}/" "${dockerfile}-tmp"
+      sed -Ei -e 's/^(ENV CHECKSUM ).*/\1'"${checksum}"'/' "${dockerfile}-tmp"
     fi
 
     if diff -q "${dockerfile}-tmp" "${dockerfile}" > /dev/null; then
@@ -201,6 +219,8 @@ for version in "${versions[@]}"; do
   # See details in function.sh
   IFS=' ' read -ra variants <<< "$(get_variants "${parentpath}")"
 
+  echo "Supported variants for ${parentpath}: ${variants[@]}"
+
   pids=()
 
   if [ -f "${version}/Dockerfile" ]; then
@@ -223,9 +243,17 @@ for version in "${versions[@]}"; do
       template_file="${parentpath}/Dockerfile-slim.template"
     elif is_alpine "${variant}"; then
       template_file="${parentpath}/Dockerfile-alpine.template"
+    elif is_windows "${variant}"; then
+      template_file="${parentpath}/Dockerfile-windows.template"
+    fi
+    
+    # Copy .sh only if not is_windows
+    if ! is_windows "${variant}"; then
+      cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh"
+    elif is_windows "${variant}"; then
+      cp "${parentpath}/docker-entrypoint.ps1" "${version}/${variant}/docker-entrypoint.ps1"
     fi
 
-    cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh"
     if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then
       update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" &
       pids+=($!)