diff --git a/dockerbuild/Dockerfile.centos7-i386 b/dockerbuild/Dockerfile.centos7-i386 index 4d0a28023..182aa7699 100644 --- a/dockerbuild/Dockerfile.centos7-i386 +++ b/dockerbuild/Dockerfile.centos7-i386 @@ -2,7 +2,7 @@ FROM centos:7 ARG go_pkg_url -RUN yum install -y curl git wget openssh-server sudo make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel ssl-devel && yum clean all +RUN yum install -y curl git wget openssh-server sudo make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel openssl openssl-devel && yum clean all RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz WORKDIR /cmake-3.17.3 RUN ./bootstrap && make -j8 && make install diff --git a/dockerbuild/Dockerfile.debian-jessie b/dockerbuild/Dockerfile.debian-jessie index 66ddf6f1c..7dbbfc52f 100644 --- a/dockerbuild/Dockerfile.debian-jessie +++ b/dockerbuild/Dockerfile.debian-jessie @@ -2,7 +2,11 @@ FROM debian:jessie-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 libssl-dev +RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz +WORKDIR /cmake-3.17.3 +RUN ./bootstrap && make -j8 && make install +WORKDIR / RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ diff --git a/dockerbuild/Dockerfile.ubuntu-trusty b/dockerbuild/Dockerfile.ubuntu-trusty index a434d6892..778eb02a3 100644 --- a/dockerbuild/Dockerfile.ubuntu-trusty +++ b/dockerbuild/Dockerfile.ubuntu-trusty @@ -2,7 +2,11 @@ FROM ubuntu:trusty-20191217 ARG go_pkg_url -RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd libssl-dev +RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz +WORKDIR /cmake-3.17.3 +RUN ./bootstrap && make -j8 && make install +WORKDIR / RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \