Merge pull request #14 from LibrePCB/update-windows-image

Update various tools in Windows image

Author: ubruhin

windowsservercore-ltsc2019-qt5.15.2-32bit/Dockerfile

@@ -6,14 +6,12 @@ RUN powershell -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command \
   && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
 
 # Install Chocolatey Packages
-# Note: Funq doesn't work with Python3 or x64, thus we need Python2 x86.
+# Note: Funq requires to install x86 Python since Qt is also x86!
 ENV PYTHONIOENCODING "UTF-8"
 RUN choco install -y 7zip ccache vcredist2017 \
   && choco install -y git --params "/GitAndUnixToolsOnPath /NoAutoCrlf" \
-  && choco install --forcex86 -y python2
-
-# Install Python Packages
-RUN pip install future "flake8==3.7.7"
+  && choco install --forcex86 -y python3 --version 3.10.0 \
+  && choco install -y cmake --version 3.21.3 --installargs "ADD_CMAKE_TO_PATH=System"
 
 # Install MinGW
 ARG MINGW_URL="https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_mingw/qt.tools.win32_mingw810/8.1.0-1-202004170606i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z"
@@ -23,18 +21,11 @@ RUN powershell -Command Invoke-WebRequest $env:MINGW_URL -OutFile 'C:/tmp.7z' -U
   && del C:\tmp.7z
 
 # Install OpenSSL
-ARG OPENSSL_URL="http://slproweb.com/download/Win32OpenSSL_Light-1_1_1g.exe"
+ARG OPENSSL_URL="http://slproweb.com/download/Win32OpenSSL_Light-1_1_1L.exe"
 RUN powershell -Command Invoke-WebRequest $env:OPENSSL_URL -OutFile 'C:/tmp.exe' -UseBasicParsing ; \
   && C:/tmp.exe /silent /verysilent /suppressmsgboxes /sp- /dir=C:/OpenSSL-Win32 \
   && del C:\tmp.exe
 
-# Install CMake
-ARG CMAKE_URL="https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_cmake/qt.tools.cmake.win64/3.19.2-202101071154windows64_x64_cmake_tools.7z"
-RUN powershell -Command Invoke-WebRequest $env:CMAKE_URL -OutFile 'C:/tmp.7z' -UseBasicParsing ; \
-  && 7z x C:/tmp.7z -oC:/Qt -bsp1 \
-  && setx PATH "%PATH%;C:\Qt\Tools\CMake_64\bin" \
-  && del C:\tmp.7z
-
 # Install Qt whatever DLLs
 ARG QT_VERSION="5.15.2"
 ARG QT_URL="https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5152/qt.qt5.5152.win32_mingw81/5.15.2-0-202011130602"