diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-02-19 11:52:04 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-02-21 10:49:41 +0000 |
| commit | e332de10b30665d9d6dcaf6d4d72aad918ca0b5d (patch) | |
| tree | f0823659ed0f86e886db03697fb9a1c629a553bb /docker/windowsservercore | |
| parent | 385dbb2ad143bbd0c32f21d6e3cbbd4d116ebcff (diff) | |
docker: update Windows image
- install latest vs2019 compiler
- install latest win10 SDK
- add vswhere to simplify searching VS
- update Qt to 6.2.4
- update Qbs to 1.24.0
- drop support for 32-bit packages in choco
Change-Id: I0a57baf160307b84e62fea5c56687efcce7fe42c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker/windowsservercore')
| -rw-r--r-- | docker/windowsservercore/Dockerfile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile index 0909d81f2..8fce9fa59 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -6,7 +6,7 @@ LABEL Description="Windows Server Core development environment for Qbs with Qt, RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f -# Install VS from the website since chocolatey has broken .NET 4.8 (dotnetfx package) which is a +# Install VS 2019 from the website since chocolatey has broken .NET 4.8 (dotnetfx package) which is a # dependency for the visualstudio2019buildtools package RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ Invoke-WebRequest "https://aka.ms/vs/16/release/vs_community.exe" \ @@ -14,18 +14,17 @@ RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ RUN "%TEMP%\vs_community.exe" --quiet --wait --norestart --noUpdateInstaller \ --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \ - --add Microsoft.VisualStudio.Component.Windows10SDK.18362 + --add Microsoft.VisualStudio.Component.Windows10SDK.20348 RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ $Env:chocolateyVersion = '0.10.15' ; \ $Env:chocolateyUseWindowsCompression = 'false' ; \ "[Net.ServicePointManager]::SecurityProtocol = \"tls12, tls11, tls\"; iex ((New-Object System.Net.WebClient).DownloadString('http://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" -ARG QBS_VERSION -RUN choco install -y python && \ +RUN choco install -y python --version 3.9 && \ choco install -y 7zip --version 19.0 && \ choco install -y git --version 2.24.0 --params "/GitAndUnixToolsOnPath" && \ - choco install -y qbs --version %QBS_VERSION% + choco install -y vswhere # for building the documentation RUN pip install beautifulsoup4 lxml @@ -42,13 +41,14 @@ RUN certutil -generateSSTFromWU roots.sst && \ ARG QT_VERSION COPY scripts/install-qt.sh install-qt.sh -RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools" +RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools qt5compat" ENV QTDIR64=C:\\Qt\\${QT_VERSION}\\msvc2019_64 -RUN bash -c "./install-qt.sh -d /c/Qt --version ${QT_VERSION} --toolchain win32_msvc2019 qtbase qtdeclarative qttools" -ENV QTDIR=C:\\Qt\\${QT_VERSION}\\msvc2019 +########### Install Qbs ############# +ARG QTCREATOR_VERSION +RUN bash -c "./install-qt.sh -d /c/Qt --version ${QTCREATOR_VERSION} qtcreator" +RUN setx PATH "C:\\Qt\\Tools\\QtCreator\\bin;%PATH%" RUN qbs setup-toolchains --detect && \ qbs setup-qt %QTDIR64%/bin/qmake.exe qt64 && \ - qbs setup-qt %QTDIR%/bin/qmake.exe qt && \ qbs config defaultProfile qt64 |