Skip to content

Commit 0704e88

Browse files
committed
Windows: Install CMake with Chocolatey instead of from Qt
Because the Qt URL is not static so the Docker image is not reproducible.
1 parent bb3e969 commit 0704e88

File tree

1 file changed

+2
-8
lines changed
  • windowsservercore-ltsc2019-qt5.15.2-32bit

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ RUN powershell -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command \
1010
ENV PYTHONIOENCODING "UTF-8"
1111
RUN choco install -y 7zip ccache vcredist2017 \
1212
&& choco install -y git --params "/GitAndUnixToolsOnPath /NoAutoCrlf" \
13-
&& choco install --forcex86 -y python3 --version 3.10.0
13+
&& choco install --forcex86 -y python3 --version 3.10.0 \
14+
&& choco install -y cmake --version 3.21.3 --installargs "ADD_CMAKE_TO_PATH=System"
1415

1516
# Install MinGW
1617
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"
@@ -25,13 +26,6 @@ RUN powershell -Command Invoke-WebRequest $env:OPENSSL_URL -OutFile 'C:/tmp.exe'
2526
&& C:/tmp.exe /silent /verysilent /suppressmsgboxes /sp- /dir=C:/OpenSSL-Win32 \
2627
&& del C:\tmp.exe
2728

28-
# Install CMake
29-
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"
30-
RUN powershell -Command Invoke-WebRequest $env:CMAKE_URL -OutFile 'C:/tmp.7z' -UseBasicParsing ; \
31-
&& 7z x C:/tmp.7z -oC:/Qt -bsp1 \
32-
&& setx PATH "%PATH%;C:\Qt\Tools\CMake_64\bin" \
33-
&& del C:\tmp.7z
34-
3529
# Install Qt whatever DLLs
3630
ARG QT_VERSION="5.15.2"
3731
ARG QT_URL="https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5152/qt.qt5.5152.win32_mingw81/5.15.2-0-202011130602"

0 commit comments

Comments
 (0)