Fixed build-test-windows.yml

Signed-off-by: Daniel Fiala <[email protected]>
nodejs · Sep 20, 2024 · ae87831 · ae87831
1 parent 17332aa
commit ae87831
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
@@ -110,4 +110,5 @@ jobs:
           }
 
       - name: Test for npm
-        run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version
+        # We need to use powershell.exe to run npm because docker needs to attach to process and npm is a batch file/powershell script
+        run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} powershell.exe npm --version
diff --git a/22/windowsservercore-ltsc2019/Dockerfile b/22/windowsservercore-ltsc2019/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019 as installer
+FROM mcr.microsoft.com/windows/servercore:ltsc2019
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -18,5 +18,3 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Remove-Item node.zip -Force ; \
     node --version; \
     npm --version;
-
-CMD [ "node.exe" ]
diff --git a/22/windowsservercore-ltsc2022/Dockerfile b/22/windowsservercore-ltsc2022/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2022 as installer
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -18,5 +18,3 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Remove-Item node.zip -Force ; \
     node --version; \
     npm --version;
-
-CMD [ "node.exe" ]
diff --git a/Dockerfile-windows.template b/Dockerfile-windows.template
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:version as installer
+FROM mcr.microsoft.com/windows/servercore:version
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -18,5 +18,3 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Remove-Item node.zip -Force ; \
     node --version; \
     npm --version;
-
-CMD [ "node.exe" ]