From e5e444c7aeb9de06fb8faf37d83808f925de97b4 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 4 Feb 2020 12:08:47 -0800 Subject: [PATCH] can't even build cmake on Centos 6. Will need another method for packaging --- dockerbuild/Dockerfile.centos6 | 9 +-------- dockerbuild/Dockerfile.centos6-i386 | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dockerbuild/Dockerfile.centos6 b/dockerbuild/Dockerfile.centos6 index 07a367afe..6b8f023ed 100644 --- a/dockerbuild/Dockerfile.centos6 +++ b/dockerbuild/Dockerfile.centos6 @@ -3,14 +3,7 @@ FROM centos:6 ARG go_pkg_url RUN yum update -y -RUN yum install -y curl git wget openssh-server sudo make rpmdevtools openssl-devel gcc g++ && yum clean all - -RUN curl -sL https://github.com/Kitware/CMake/releases/download/v3.16.3/cmake-3.16.3.tar.gz -o cmake.tar.gz && \ - tar -xzf cmake.tar.gz && \ - cd cmake-3.16.3 && \ - ./bootstrap && \ - make -j4 && \ - make install +RUN yum install -y curl git wget openssh-server sudo make rpmdevtools && yum clean all RUN curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ diff --git a/dockerbuild/Dockerfile.centos6-i386 b/dockerbuild/Dockerfile.centos6-i386 index e96ff804c..c6a47072b 100644 --- a/dockerbuild/Dockerfile.centos6-i386 +++ b/dockerbuild/Dockerfile.centos6-i386 @@ -4,14 +4,7 @@ ARG go_pkg_url RUN echo i386 > /etc/yum/vars/basearch && echo i686 > /etc/yum/vars/arch -RUN yum install -y curl git wget openssh-server sudo make rpmdevtools openssl-devel gcc g++ && yum clean all - -RUN curl -sL https://github.com/Kitware/CMake/releases/download/v3.16.3/cmake-3.16.3.tar.gz -o cmake.tar.gz && \ - tar -xzf cmake.tar.gz && \ - cd cmake-3.16.3 && \ - ./bootstrap && \ - make -j4 && \ - make install +RUN yum install -y curl git wget openssh-server sudo make rpmdevtools && yum clean all RUN curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \