Squash commits

nodejs · Sep 3, 2024 · d5e9215 · d5e9215
1 parent 304b70f
commit d5e9215
Show file tree

Hide file tree

Showing 11 changed files with 405 additions and 20 deletions.
diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
@@ -0,0 +1,113 @@
+name: build-test-windows
+
+on:
+  push:
+    paths:
+      - "**/windows-2019/**"
+      - "**/windows-2022/**"
+      - ".github/workflows/build-test-windows.yml"
+
+  pull_request:
+    paths:
+      - "**/windows-2019/**"
+      - "**/windows-2022/**"
+      - ".github/workflows/build-test-windows.yml"
+
+jobs:
+  build-windows-2019:
+    name: build-windows-2019
+    runs-on: windows-2019
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix: 
+        version: [ 22.7.0 ]
+        variant: [ "windows-2019" ]
+
+    steps:
+      - name: Get short node version
+        uses: actions/github-script@v7
+        id: short-version
+        with:
+          result-encoding: string
+          script: return "${{ matrix.version }}".split('.')[0]
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # We cannot use docker/build-push-action here because it requires buildx, which is not available on Windows
+      - name: Build image
+        run: |
+          docker build --tag node:${{ matrix.version }}-${{ matrix.variant }} ./${{ steps.short-version.outputs.result }}/${{ matrix.variant }}
+
+      - name: Test for node version
+        shell: pwsh
+        run: |
+          $image_node_version = (docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} node --print "process.versions.node").Trim() 
+          Write-Host "Expected: '${{ matrix.version }}', Got: '$image_node_version'"
+          if ($image_node_version -ne "${{ matrix.version }}") {
+            exit 1 
+          }
+        
+      - name: Verify entrypoint runs regular, non-executable files with node
+        shell: pwsh
+        run: |
+          $tempDir = New-Item -ItemType Directory -Path $env:TEMP -Name "tempNodeApp" 
+          $tmp_file = Join-Path $tempDir "index.js"
+          "console.log('success')" | Out-File -FilePath $tmp_file -Encoding utf8
+          $output = (docker run --rm -w /app --mount "type=bind,src=$tempDir,target=c:\app" node:${{ matrix.version }}-${{ matrix.variant }} C:/app/index.js)
+          if ($output -ne 'success') {
+              Write-Host "Invalid"
+          }
+        
+      - name: Test for npm
+        run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version
+
+  build-windows-2022:
+    name: build-windows-2022
+    runs-on: windows-2022
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix: 
+        version: [ "22.7.0" ]
+        variant: [ "windows-2022" ]
+
+    steps:
+      - name: Get short node version
+        uses: actions/github-script@v7
+        id: short-version
+        with:
+          result-encoding: string
+          script: return "${{ matrix.version }}".split('.')[0]
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # We cannot use docker/build-push-action here because it requires buildx, which is not available on Windows
+      - name: Build image
+        run: |
+          docker build --tag node:${{ matrix.version }}-${{ matrix.variant }} ./${{ steps.short-version.outputs.result }}/${{ matrix.variant }}
+
+      - name: Test for node version
+        shell: pwsh
+        run: |
+          $image_node_version = (docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} node --print "process.versions.node").Trim() 
+          Write-Host "Expected: '${{ matrix.version }}', Got: '$image_node_version'"
+          if ($image_node_version -ne "${{ matrix.version }}") {
+            exit 1
+          }
+        
+      - name: Verify entrypoint runs regular, non-executable files with node
+        shell: pwsh
+        run: |
+          $tempDir = New-Item -ItemType Directory -Path $env:TEMP -Name "tempNodeApp" 
+          $tmp_file = Join-Path $tempDir "index.js"
+          "console.log('success')" | Out-File -FilePath $tmp_file -Encoding utf8
+          $output = (docker run --rm -w /app --mount "type=bind,src=$tempDir,target=c:\app" node:${{ matrix.version }}-${{ matrix.variant }} C:/app/index.js)
+          if ($output -ne 'success') {
+              Write-Host "Invalid"
+          }
+        
+      - name: Test for npm
+        run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version
diff --git a/22/windows-2019/Dockerfile b/22/windows-2019/Dockerfile
@@ -0,0 +1,62 @@
+FROM mcr.microsoft.com/windows/servercore:ltsc2019 as installer
+
+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:\Program Files (x86)\GnuPG\bin;{0}' -f $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 22.7.0
+ENV NODE_CHECKSUM 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
+
+ENV GPG_VERSION 2.4.5_20240307
+
+RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
+	Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
+	gpg --version;
+
+RUN @( \
+      '4ED778F539E3634C779C87C6D7062848A1AB005C', \
+      '141F07595B7B3FFE74309A937405533BE57C7D57', \
+      '74F12602B6F1C4E913FAA37AD3A89613643B6201', \
+      'DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7', \
+      '61FC681DFB92A079F1685E77973F295594EC4689', \
+      '8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600', \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
+      '890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4', \
+      'C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C', \
+      '108F52B48DB57BB0CC439B2997B01419BD92F80A', \
+      'A363A499291CBBC940DD62E41F10027AF002F8B0', \
+      'CC68F5A3106FF448322E48ED27F5E38D5B0A215F' \
+    ) | foreach { \
+      gpg --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
+    } ; \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+    Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
+    gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
+    Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
+    $sum = $(cat SHASUMS256.txt.asc | sls $('  node-v{0}-win-x64.zip' -f $env:NODE_VERSION)) -Split ' ' ; \
+    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $sum[0]) { Write-Error 'SHA256 mismatch' } ; \
+    Expand-Archive node.zip -DestinationPath C:\ ; \
+    Rename-Item -Path $('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2019 as runner
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
+
+COPY --from=installer C:/nodejs C:/nodejs
+
+COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
+ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
+
+# Smoke test
+RUN node --version; \
+	npm --version;
+
+CMD [ "node.exe" ]
diff --git a/22/windows-2019/docker-entrypoint.ps1 b/22/windows-2019/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)]
diff --git a/22/windows-2022/Dockerfile b/22/windows-2022/Dockerfile
@@ -0,0 +1,62 @@
+FROM mcr.microsoft.com/windows/servercore:ltsc2022 as installer
+
+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:\Program Files (x86)\GnuPG\bin;{0}' -f $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 22.7.0
+ENV NODE_CHECKSUM 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
+
+ENV GPG_VERSION 2.4.5_20240307
+
+RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
+	Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
+	gpg --version;
+
+RUN @( \
+      '4ED778F539E3634C779C87C6D7062848A1AB005C', \
+      '141F07595B7B3FFE74309A937405533BE57C7D57', \
+      '74F12602B6F1C4E913FAA37AD3A89613643B6201', \
+      'DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7', \
+      '61FC681DFB92A079F1685E77973F295594EC4689', \
+      '8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600', \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
+      '890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4', \
+      'C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C', \
+      '108F52B48DB57BB0CC439B2997B01419BD92F80A', \
+      'A363A499291CBBC940DD62E41F10027AF002F8B0', \
+      'CC68F5A3106FF448322E48ED27F5E38D5B0A215F' \
+    ) | foreach { \
+      gpg --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
+    } ; \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+    Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
+    gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
+    Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
+    $sum = $(cat SHASUMS256.txt.asc | sls $('  node-v{0}-win-x64.zip' -f $env:NODE_VERSION)) -Split ' ' ; \
+    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $sum[0]) { Write-Error 'SHA256 mismatch' } ; \
+    Expand-Archive node.zip -DestinationPath C:\ ; \
+    Rename-Item -Path $('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2022 as runner
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
+
+COPY --from=installer C:/nodejs C:/nodejs
+
+COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
+ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
+
+# Smoke test
+RUN node --version; \
+	npm --version;
+
+CMD [ "node.exe" ]
diff --git a/22/windows-2022/docker-entrypoint.ps1 b/22/windows-2022/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)]
diff --git a/Dockerfile-windows.template b/Dockerfile-windows.template
@@ -0,0 +1,51 @@
+FROM mcr.microsoft.com/windows/servercore:version as installer
+
+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:\Program Files (x86)\GnuPG\bin;{0}' -f $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 NODE_CHECKSUM CHECKSUM_x64
+
+ENV GPG_VERSION 2.4.5_20240307
+
+RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
+	Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
+	gpg --version;
+
+RUN @( \
+      "${NODE_KEYS[@]}"
+    ) | foreach { \
+      gpg --keyserver hkps://keys.openpgp.org --recv-keys $_ ; \
+    } ; \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \
+    Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
+    gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc ; \
+    Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
+    $sum = $(cat SHASUMS256.txt.asc | sls $('  node-v{0}-win-x64.zip' -f $env:NODE_VERSION)) -Split ' ' ; \
+    if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $sum[0]) { Write-Error 'SHA256 mismatch' } ; \
+    Expand-Archive node.zip -DestinationPath C:\ ; \
+    Rename-Item -Path $('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'
+
+FROM mcr.microsoft.com/windows/servercore:version as runner
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN $newPath = ('C:\nodejs;{0}' -f $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
+
+COPY --from=installer C:/nodejs C:/nodejs
+
+COPY docker-entrypoint.ps1 C:/docker-entrypoint.ps1
+ENTRYPOINT [ "powershell.exe" , "C:/docker-entrypoint.ps1" ]
+
+# Smoke test
+RUN node --version; \
+	npm --version;
+
+CMD [ "node.exe" ]
diff --git a/architectures b/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
diff --git a/docker-entrypoint.ps1 b/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)]
diff --git a/functions.sh b/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