From 526c6571a4e3664f5b5298987df1c7462c4e8465 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 24 Oct 2019 16:46:05 +0200
Subject: [PATCH] Update cmake to 3.15.4
---
ubuntu18.04/base/Dockerfile | 8 ++++----
windows1809/base/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ubuntu18.04/base/Dockerfile b/ubuntu18.04/base/Dockerfile
index 74fb5af..bbc6468 100644
--- a/ubuntu18.04/base/Dockerfile
+++ b/ubuntu18.04/base/Dockerfile
@@ -84,13 +84,13 @@ RUN python3.7 -m pip --no-cache-dir install \
psutil
RUN cd /tmp && \
- curl -sSLO https://cmake.org/files/v3.14/cmake-3.14.5.tar.gz && \
- tar -xf cmake-3.14.5.tar.gz && \
- cd cmake-3.14.5 && \
+ curl -sSLO https://cmake.org/files/v3.15/cmake-3.15.4.tar.gz && \
+ tar -xf cmake-3.15.4.tar.gz && \
+ cd cmake-3.15.4 && \
./configure --prefix=/usr/local && \
make install -j$(nproc --all) && \
cd .. && \
- rm -rf cmake-3.14.5*
+ rm -rf cmake-3.15.4*
COPY hdf5-1.10.2-no-trailing-attributes.patch /tmp
RUN cd /tmp && \
diff --git a/windows1809/base/Dockerfile b/windows1809/base/Dockerfile
index 74b3705..e888f88 100644
--- a/windows1809/base/Dockerfile
+++ b/windows1809/base/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-NoProfile", "-ExecutionPolicy Bypass", "-Command", "$Erro
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')); \
- choco install -y cmake --version 3.14.5 --installargs "ADD_CMAKE_TO_PATH=System"; \
+ choco install -y cmake --version 3.15.4 --installargs "ADD_CMAKE_TO_PATH=System"; \
choco install -y kitware-ninja --version 1.8.2.8127911; \
choco install -y \
git \
--
GitLab