From 8da24f5e36926ac29e18db6deecac9f0ed7a4519 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Mon, 17 Sep 2018 00:34:27 +0200
Subject: [PATCH] Cleanup windows dockerfile
---
windows/Dockerfile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/windows/Dockerfile b/windows/Dockerfile
index da84ea4..6f6a7ad 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -10,6 +10,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
choco install -y cmake --version 3.12.2 --installargs "ADD_CMAKE_TO_PATH=System"; \
choco install -y \
git \
+ curl \
7zip \
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'); \
@@ -21,6 +22,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
python -m pip --no-cache-dir install --no-warn-script-location \
wheel \
twine
+COPY VsDevEnv.ps1 C:/VsDevEnv.ps1
COPY qtifwsilent.qs C:/qtifwsilent.qs
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
@@ -62,7 +64,3 @@ RUN python -m pip --no-cache-dir install --no-warn-script-location \
scipy \
matplotlib \
pandas
-
-COPY VsDevEnv.ps1 C:/VsDevEnv.ps1
-
-RUN choco install -y curl
--
GitLab