Refactor

windows/Dockerfile

@@ -15,7 +15,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
         wixtoolset; \
     (New-Object Net.WebClient).DownloadFile('https://github.com/Kitware/ninja/releases/download/v1.8.2.g972a7.kitware.dyndep-1/ninja-1.8.2.g972a7.kitware.dyndep-1_i686-pc-windows-msvc.zip', 'C:/ninja.zip'); \
     7z e C:/ninja.zip -oC:/ninja -y; \
-    Remove-Item C:/ninja.zip -Force; \
+    Remove-Item -Force C:/ninja.zip; \
     [Environment]::SetEnvironmentVariable('PATH', "$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))" + ';C:/ninja', [EnvironmentVariableTarget]::Machine); \
     choco install -y python --version 3.6.6; \
     $Env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \
@@ -26,23 +26,23 @@ COPY VsDevEnv.ps1 C:/VsDevEnv.ps1
 
 RUN curl.exe -L -o C:/cuda_9.2.148_win10_network.exe https://developer.nvidia.com/compute/cuda/9.2/Prod2/network_installers2/cuda_9.2.148_win10_network; \
     Start-Process C:/cuda_9.2.148_win10_network.exe -NoNewWindow -Wait -ArgumentList '-s nvcc_9.2 cublas_9.2 cublas_dev_9.2 cudart_9.2 cufft_9.2 cufft_dev_9.2 curand_9.2 curand_dev_9.2 cusolver_9.2 cusolver_dev_9.2 cusparse_9.2 cusparse_dev_9.2 npp_9.2 npp_dev_9.2 nvrtc_9.2 nvrtc_dev_9.2 nvml_dev_9.2'; \
-    Remove-Item C:/cuda_9.2.148_win10_network.exe -Force; \
+    Remove-Item -Force C:/cuda_9.2.148_win10_network.exe; \
     curl.exe -L -o C:/cuda_9.2.148.1_windows.exe https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_windows; \
     Start-Process C:/cuda_9.2.148.1_windows.exe -NoNewWindow -Wait -ArgumentList '-s cublas_9.2 cublas_dev_9.2'; \
-    Remove-Item C:/cuda_9.2.148.1_windows.exe -Force; \
+    Remove-Item -Force C:/cuda_9.2.148.1_windows.exe; \
     curl.exe -L -o C:/cudnn-9.2-windows10-x64-v7.1.zip http://developer.download.nvidia.com/compute/redist/cudnn/v7.1.4/cudnn-9.2-windows10-x64-v7.1.zip; \
     7z x C:/cudnn-9.2-windows10-x64-v7.1.zip; \
-    Copy-Item -Recurse -Force "./cuda/*" "$([Environment]::GetEnvironmentVariable('CUDA_PATH', [EnvironmentVariableTarget]::Machine))"; \
-    Remove-Item -Recurse -Force "./cuda"; \
+    Copy-Item -Force -Recurse "./cuda/*" "$([Environment]::GetEnvironmentVariable('CUDA_PATH', [EnvironmentVariableTarget]::Machine))"; \
+    Remove-Item -Force -Recurse "./cuda"; \
     Remove-Item -Force C:/cudnn-9.2-windows10-x64-v7.1.zip
 
 COPY qtifwsilent.qs C:/qtifwsilent.qs
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
     (New-Object Net.WebClient).DownloadFile('https://download.qt.io/official_releases/qt/5.11/5.11.1/qt-opensource-windows-x86-5.11.1.exe', 'C:/qt.exe'); \
     $Env:QT_INSTALL_DIR = 'C:/Qt'; \
-    Start-Process C:/qt.exe -ArgumentList '--verbose --script C:/qtifwsilent.qs' -NoNewWindow -Wait; \
-    Remove-Item C:/qtifwsilent.qs -Force; \
-    Remove-Item C:/qt.exe -Force; \
+    Start-Process C:/qt.exe -NoNewWindow -Wait -ArgumentList '--verbose --script C:/qtifwsilent.qs'; \
+    Remove-Item -Force C:/qtifwsilent.qs; \
+    Remove-Item -Force C:/qt.exe; \
     [Environment]::SetEnvironmentVariable('Qt5_DIR', 'C:/Qt/5.11.1/msvc2017_64', [EnvironmentVariableTarget]::Machine); \
     [Environment]::SetEnvironmentVariable('EGL_PLATFORM_DIR', 'C:/Qt/5.11.1/msvc2017_64/include/QtANGLE', [EnvironmentVariableTarget]::Machine)
 
@@ -77,9 +77,9 @@ RUN cd $Env:VCPKG_DIR; \
     Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/flang.dll ./installed/$vcpkg_triplet/bin/; \
     Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/flangrti.dll ./installed/$vcpkg_triplet/bin/; \
     Copy-Item ./downloads/tools/flang/5.0.0/Library/bin/libomp.dll ./installed/$vcpkg_triplet/bin/; \
-    Remove-Item -Recurse -Force -Path ./downloads; \
-    Remove-Item -Recurse -Force -Path ./buildtrees; \
-    Remove-Item -Recurse -Force -Path ./packages; \
+    Remove-Item -Force -Recurse ./downloads; \
+    Remove-Item -Force -Recurse ./buildtrees; \
+    Remove-Item -Force -Recurse ./packages; \
     [Environment]::SetEnvironmentVariable('VCPKG_TRIPLET', "\"$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine); \
     [Environment]::SetEnvironmentVariable('VCPKG_INSTALL_DIR', "\"$Env:VCPKG_DIR/installed/$vcpkg_triplet\"", [EnvironmentVariableTarget]::Machine);