docker/windows-release-builder.Dockerfile

@@ -22,9 +22,9 @@ RUN curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtoo
   && del /Q "%TEMP%\dd_*.log" `
   && del /Q vs_buildtools.exe
 
+SHELL ["powershell", "-NoLogo", "-ExecutionPolicy", "Bypass", "-Command"]
 
-RUN powershell -NoProfile -Command `
-  $ErrorActionPreference = 'Stop'; `
+RUN $ErrorActionPreference = 'Stop'; `
   $url = \"https://github.com/Kitware/CMake/releases/download/v$env:CMAKE_VERSION/cmake-$env:CMAKE_VERSION-$env:CMAKE_ARCH.zip\"; `
   $out = 'C:\\cmake.zip'; `
   (New-Object System.Net.WebClient).DownloadFile($url, $out); `
@@ -33,38 +33,22 @@ RUN powershell -NoProfile -Command `
   $cmakeDir = \"C:\\cmake-$env:CMAKE_VERSION-$env:CMAKE_ARCH\\bin\"; `
   [Environment]::SetEnvironmentVariable('PATH', $cmakeDir + ';' + $env:PATH, 'Machine')
 
-RUN powershell -Command `
-  $ErrorActionPreference = 'Stop'; `
-  Invoke-WebRequest -Uri https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe -OutFile rustup-init.exe; `
-  .\rustup-init.exe -y --default-toolchain stable; `
-  Remove-Item .\rustup-init.exe
-
 # Install Chocolatey
-RUN ["powershell.exe", "-NoLogo", "-NoProfile", "-Command", `
-  "Set-ExecutionPolicy Bypass -Scope Process; `
+RUN Set-ExecutionPolicy Bypass -Scope Process; `
   [System.Net.ServicePointManager]::SecurityProtocol = `
   [System.Net.SecurityProtocolType]::Tls12; `
-  iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))" `
-  ]
+  iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 
 # Install Git and Rustup via Chocolatey
-RUN ["powershell.exe", "-NoLogo", "-NoProfile", "-Command", `
-  "choco install git -y --no-progress; `
-  choco install rustup.install -y --no-progress" `
-  ]
+RUN choco install git -y --no-progress; `
+  choco install rustup.install -y --no-progress 
 
 # Install stable Rust toolchain
-RUN ["powershell.exe", "-NoLogo", "-NoProfile", "-Command", `
-  "$env:Path += ';C:\\Users\\ContainerAdministrator\\.cargo\\bin'; `
-  rustup toolchain install stable-x86_64-pc-windows-msvc; `
-  rustup default stable-x86_64-pc-windows-msvc" `
-  ]
+RUN rustup toolchain install stable-x86_64-pc-windows-msvc; `
+  rustup default stable-x86_64-pc-windows-msvc
 
 # Install dioxus-cli from git HEAD with cargo
-RUN ["powershell.exe", "-NoLogo", "-NoProfile", "-Command", `
-  "$env:Path += ';C:\\Users\\ContainerAdministrator\\.cargo\\bin'; `
-  cargo install --git https://github.com/DioxusLabs/dioxus dioxus-cli" `
-  ]
+RUN cargo install --git https://github.com/DioxusLabs/dioxus dioxus-cli
 
 # Define the entry point for the docker container.
 # This entry point starts the developer command prompt and launches the PowerShell shell.