explicitly set SHELL to cmd, bring back build.bat RUN without ENTRYPO…

…INT-like type of execution in instance Dockerfile
Devsh-Graphics-Programming · Nov 26, 2023 · 462b4bc · 462b4bc
1 parent b500ef9
commit 462b4bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,8 @@ ARG CMAKE_SCRIPTS_DIRECTORY="C:\docker\scripts\cmake"
 
 FROM ${BASE_IMAGE}
 
+SHELL ["cmd", "/S", "/C"]
+
 RUN `
 	# Download node LTS
 	curl -SL --output nodejs.msi https://nodejs.org/dist/v20.9.0/node-v20.9.0-x64.msi `

diff --git a/project/Dockerfile b/project/Dockerfile
@@ -7,6 +7,8 @@ ARG BUILD_SCRIPT_ARGS="-- -j1"
 
 FROM ${BASE_IMAGE}
 
+SHELL ["cmd", "/S", "/C"]
+
 ARG BUILD_SCRIPT_DIRECTORY
 
 RUN `
@@ -21,7 +23,7 @@ ARG BUILD_SCRIPT_ARGS
 
 # Build DXC
 RUN `
-	VsDevCmd.bat && powershell.exe -NoLogo -ExecutionPolicy Bypass -Command build.bat %BUILD_SCRIPT_ARGS%
+	build.bat %BUILD_SCRIPT_ARGS%
 
 # Generate dxc.local.properties
 RUN `