Browse Source

fix docker images for static targets

Grant Limberg 5 years ago
parent
commit
0c5d1a793c

+ 1 - 1
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

+ 5 - 1
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 && \

+ 5 - 1
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 && \