From 066cdfe2ac8e3e1c474125090684f3aac39bfe84 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 12 Jun 2020 13:46:40 -0700 Subject: [PATCH] alternate newer cmake install --- dockerbuild/Dockerfile.debian-stretch | 6 +++++- dockerbuild/Dockerfile.ubuntu-xenial | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch index 4e4916dd0..17abc98c9 100644 --- a/dockerbuild/Dockerfile.debian-stretch +++ b/dockerbuild/Dockerfile.debian-stretch @@ -2,11 +2,15 @@ FROM debian:stretch-20191224 ARG go_pkg_url -RUN apt-get update && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz +RUN curl -s https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \ + chmod +x cmake.sh && \ + ./cmake.sh && \ + rm cmake.sh RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build diff --git a/dockerbuild/Dockerfile.ubuntu-xenial b/dockerbuild/Dockerfile.ubuntu-xenial index 6d77bb4e2..9cb579f6a 100644 --- a/dockerbuild/Dockerfile.ubuntu-xenial +++ b/dockerbuild/Dockerfile.ubuntu-xenial @@ -2,11 +2,16 @@ FROM ubuntu:xenial-20200114 ARG go_pkg_url -RUN apt-get update && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz +RUN curl -s https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \ + chmod +x cmake.sh && \ + ./cmake.sh && \ + rm cmake.sh + RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build