From 265e4e46a67ac67143aa13a21d90c48ae3cad4f8 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 25 Feb 2021 10:49:55 +0100
Subject: [PATCH] [windows] split&move vcpkg blocks
---
windows/base/Dockerfile | 22 +++-------------------
windows/cuda-devel/Dockerfile | 23 +++++++++++++++++++++++
windows/devel/Dockerfile | 23 +++++++++++++++++++++++
3 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index 13f8bfc..5d55001 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -57,29 +57,13 @@ ADD powershell/30-Vcpkg-CMake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profi
RUN cd $env:VCPKG_DIR; \
Must-Run ./vcpkg install --triplet "$env:VCPKG_TARGET_TRIPLET" \
- libepoxy \
- glm \
- cgal \
- fmt \
- "\"hdf5[cpp]\"" \
- pybind11 \
- boost-program-options \
- boost-property-tree \
- boost-circular-buffer \
- boost-timer \
- boost-multi-array \
- jsoncpp \
- websocketpp \
- freetype \
- harfbuzz \
- rpclib \
- eigen3 \
- openblas \
libjpeg-turbo \
libwebp \
+ tiff \
+ openblas \
+ "\"hdf5[cpp]\"" \
opengl \
protobuf \
- tiff \
"\"xtensor[xsimd,tbb]\"" \
; \
Remove-Item -Force -Recurse ./downloads; \
diff --git a/windows/cuda-devel/Dockerfile b/windows/cuda-devel/Dockerfile
index 3f2130a..7ba4b5f 100644
--- a/windows/cuda-devel/Dockerfile
+++ b/windows/cuda-devel/Dockerfile
@@ -33,6 +33,29 @@ RUN cd $env:VCPKG_DIR; \
Remove-Item -Force -Recurse ./buildtrees; \
Remove-Item -Force -Recurse ./packages;
+RUN cd $env:VCPKG_DIR; \
+ Must-Run ./vcpkg install --triplet "$env:VCPKG_TARGET_TRIPLET" \
+ boost-program-options \
+ boost-property-tree \
+ boost-circular-buffer \
+ boost-timer \
+ boost-multi-array \
+ libepoxy \
+ glm \
+ cgal \
+ fmt \
+ jsoncpp \
+ websocketpp \
+ freetype \
+ harfbuzz \
+ rpclib \
+ eigen3 \
+ pybind11 \
+ ; \
+ Remove-Item -Force -Recurse ./downloads; \
+ Remove-Item -Force -Recurse ./buildtrees; \
+ Remove-Item -Force -Recurse ./packages;
+
RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
diff --git a/windows/devel/Dockerfile b/windows/devel/Dockerfile
index 710a6c1..adc5b22 100644
--- a/windows/devel/Dockerfile
+++ b/windows/devel/Dockerfile
@@ -22,6 +22,29 @@ RUN cd $env:VCPKG_DIR; \
Remove-Item -Force -Recurse ./buildtrees; \
Remove-Item -Force -Recurse ./packages;
+RUN cd $env:VCPKG_DIR; \
+ Must-Run ./vcpkg install --triplet "$env:VCPKG_TARGET_TRIPLET" \
+ boost-program-options \
+ boost-property-tree \
+ boost-circular-buffer \
+ boost-timer \
+ boost-multi-array \
+ libepoxy \
+ glm \
+ cgal \
+ fmt \
+ jsoncpp \
+ websocketpp \
+ freetype \
+ harfbuzz \
+ rpclib \
+ eigen3 \
+ pybind11 \
+ ; \
+ Remove-Item -Force -Recurse ./downloads; \
+ Remove-Item -Force -Recurse ./buildtrees; \
+ Remove-Item -Force -Recurse ./packages;
+
RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
--
GitLab