diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-21 23:31:51 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-22 08:54:53 +0000 |
| commit | 6fc3adcab9b7d0010ad43f23386dc4e94f61eda9 (patch) | |
| tree | e334ca86537fc77c68a4f007a9b4398f033b2d6d | |
| parent | ab1f8a1c6fbf40e2b94fa9112f0e5b85e7ed68b8 (diff) | |
Docker: check that the installation of Chocolatey packages succeeds
In some versions of Windows with a certain set of patches installed,
the Visual C++ Build Tools installer has been observed to fail during
initialization but still exit with zero status causing a silent failure.
This patch ensures that it won't be possible to build a Docker image
where the build tools didn't actually get installed.
Change-Id: Ibc90b476dae901651002a3619f7c1dbec38bc51b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | docker/windowsservercore/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile index 14890248b..942ecbd2b 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -22,7 +22,7 @@ RUN @powershell -NoProfile -ExecutionPolicy Bypass -Command \ $Env:chocolateyVersion = '0.10.5' ; \ $Env:chocolateyUseWindowsCompression = 'false' ; \ "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" -RUN choco install -y qbs --version 1.8.1 -RUN choco install -y unzip --version 6.0 -RUN choco install -y visualcpp-build-tools --version 14.0.25420.1 -RUN choco install -y zip --version 3.0 +RUN choco install -y qbs --version 1.8.1 && qbs --version +RUN choco install -y unzip --version 6.0 && unzip -v +RUN choco install -y visualcpp-build-tools --version 14.0.25420.1 && dir "%PROGRAMFILES(X86)%\Microsoft Visual C++ Build Tools" +RUN choco install -y zip --version 3.0 && zip -v |