From 931ad1aca8c6c4d4e85a9df1a52e645bc43dc481 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 4 Feb 2020 11:38:42 -0800 Subject: [PATCH] Add CMake to all the docker images --- dockerbuild/Dockerfile.centos6 | 7 +++++++ dockerbuild/Dockerfile.centos6-i386 | 7 +++++++ dockerbuild/Dockerfile.centos7 | 7 +++++++ dockerbuild/Dockerfile.centos7-i386 | 7 +++++++ dockerbuild/Dockerfile.centos8 | 2 +- dockerbuild/Dockerfile.clefos-s390x | 8 +++++++- dockerbuild/Dockerfile.debian-bullseye | 2 +- dockerbuild/Dockerfile.debian-buster | 2 +- dockerbuild/Dockerfile.debian-jessie | 7 +++++++ dockerbuild/Dockerfile.debian-sid | 2 +- dockerbuild/Dockerfile.debian-stretch | 7 +++++++ dockerbuild/Dockerfile.debian-wheezy | 7 +++++++ dockerbuild/Dockerfile.ubuntu-bionic | 2 +- dockerbuild/Dockerfile.ubuntu-eoan | 2 +- dockerbuild/Dockerfile.ubuntu-trusty | 7 +++++++ dockerbuild/Dockerfile.ubuntu-xenial | 7 +++++++ dockerbuild/Makefile | 5 ++++- 17 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dockerbuild/Dockerfile.centos6 b/dockerbuild/Dockerfile.centos6 index 6b8f023ed..c83eb1817 100644 --- a/dockerbuild/Dockerfile.centos6 +++ b/dockerbuild/Dockerfile.centos6 @@ -5,6 +5,13 @@ ARG go_pkg_url RUN yum update -y RUN yum install -y curl git wget openssh-server sudo make rpmdevtools && 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 curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.centos6-i386 b/dockerbuild/Dockerfile.centos6-i386 index c6a47072b..57a78422b 100644 --- a/dockerbuild/Dockerfile.centos6-i386 +++ b/dockerbuild/Dockerfile.centos6-i386 @@ -6,6 +6,13 @@ 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 && 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 curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.centos7 b/dockerbuild/Dockerfile.centos7 index 751d02c0c..6616d3582 100644 --- a/dockerbuild/Dockerfile.centos7 +++ b/dockerbuild/Dockerfile.centos7 @@ -5,6 +5,13 @@ ARG go_pkg_url RUN yum install -y epel-release RUN yum install -y curl git wget openssh-server sudo make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel centos-release-scl devtoolset-8 llvm-toolset-7 && 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 curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.centos7-i386 b/dockerbuild/Dockerfile.centos7-i386 index f7ee9a0c4..99b56ea3a 100644 --- a/dockerbuild/Dockerfile.centos7-i386 +++ b/dockerbuild/Dockerfile.centos7-i386 @@ -4,6 +4,13 @@ ARG go_pkg_url RUN yum install -y curl git wget openssh-server sudo make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel && 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 curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.centos8 b/dockerbuild/Dockerfile.centos8 index 106ab5b44..c4f0ee9d7 100644 --- a/dockerbuild/Dockerfile.centos8 +++ b/dockerbuild/Dockerfile.centos8 @@ -3,7 +3,7 @@ FROM centos:8 ARG go_pkg_url RUN yum install -y epel-release -RUN yum install -y curl git wget openssh-server sudo make rpmdevtools clang gcc-c++ ruby ruby-devel && yum clean all +RUN yum install -y curl git wget openssh-server sudo make rpmdevtools clang gcc-c++ ruby ruby-devel cmake && 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.clefos-s390x b/dockerbuild/Dockerfile.clefos-s390x index 135f70abc..f473a89c9 100644 --- a/dockerbuild/Dockerfile.clefos-s390x +++ b/dockerbuild/Dockerfile.clefos-s390x @@ -2,7 +2,13 @@ FROM s390x/clefos: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 && yum clean all +RUN yum install -y curl git wget openssh-server sudo make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel openssl-devel && 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 curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ diff --git a/dockerbuild/Dockerfile.debian-bullseye b/dockerbuild/Dockerfile.debian-bullseye index 518a08ae2..9fc07b015 100644 --- a/dockerbuild/Dockerfile.debian-bullseye +++ b/dockerbuild/Dockerfile.debian-bullseye @@ -2,7 +2,7 @@ FROM debian:bullseye-20191224 ARG go_pkg_url -RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd cmake RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ diff --git a/dockerbuild/Dockerfile.debian-buster b/dockerbuild/Dockerfile.debian-buster index 6504178bc..42d0b21d9 100644 --- a/dockerbuild/Dockerfile.debian-buster +++ b/dockerbuild/Dockerfile.debian-buster @@ -2,7 +2,7 @@ FROM debian:buster-20191224 ARG go_pkg_url -RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd cmake RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ diff --git a/dockerbuild/Dockerfile.debian-jessie b/dockerbuild/Dockerfile.debian-jessie index 31b0a904b..f3b394266 100644 --- a/dockerbuild/Dockerfile.debian-jessie +++ b/dockerbuild/Dockerfile.debian-jessie @@ -8,6 +8,13 @@ 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 -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 groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build RUN chmod 777 /home diff --git a/dockerbuild/Dockerfile.debian-sid b/dockerbuild/Dockerfile.debian-sid index 5fde10d5d..0d5b9b15a 100644 --- a/dockerbuild/Dockerfile.debian-sid +++ b/dockerbuild/Dockerfile.debian-sid @@ -2,7 +2,7 @@ FROM debian:sid-20191224 ARG go_pkg_url -RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd cmake RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch index 76342fb8d..0154ec702 100644 --- a/dockerbuild/Dockerfile.debian-stretch +++ b/dockerbuild/Dockerfile.debian-stretch @@ -4,6 +4,13 @@ ARG go_pkg_url RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +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 curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.debian-wheezy b/dockerbuild/Dockerfile.debian-wheezy index 7322959e6..149ac3de8 100644 --- a/dockerbuild/Dockerfile.debian-wheezy +++ b/dockerbuild/Dockerfile.debian-wheezy @@ -12,6 +12,13 @@ RUN echo "deb http://archive.debian.org/debian/ wheezy contrib main non-free" > libdb5.1=5.1.29-5 libdb5.1-dev libssl1.0.0=1.0.1e-2+deb7u20 procps gawk libsigsegv2 \ curl ca-certificates devscripts +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 curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.ubuntu-bionic b/dockerbuild/Dockerfile.ubuntu-bionic index 2bbc5b02e..bfb640dfe 100644 --- a/dockerbuild/Dockerfile.ubuntu-bionic +++ b/dockerbuild/Dockerfile.ubuntu-bionic @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20200112 ARG go_pkg_url -RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd cmake 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-eoan b/dockerbuild/Dockerfile.ubuntu-eoan index 0fd5e33ca..d30c0c0de 100644 --- a/dockerbuild/Dockerfile.ubuntu-eoan +++ b/dockerbuild/Dockerfile.ubuntu-eoan @@ -2,7 +2,7 @@ FROM ubuntu:eoan-20200114 ARG go_pkg_url -RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd cmake 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 52a80c949..aa7c6c4f2 100644 --- a/dockerbuild/Dockerfile.ubuntu-trusty +++ b/dockerbuild/Dockerfile.ubuntu-trusty @@ -4,6 +4,13 @@ ARG go_pkg_url RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +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 curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Dockerfile.ubuntu-xenial b/dockerbuild/Dockerfile.ubuntu-xenial index bda74f477..58191d8a4 100644 --- a/dockerbuild/Dockerfile.ubuntu-xenial +++ b/dockerbuild/Dockerfile.ubuntu-xenial @@ -4,6 +4,13 @@ ARG go_pkg_url RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd +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 curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile index 543d45d5a..1d6939f36 100644 --- a/dockerbuild/Makefile +++ b/dockerbuild/Makefile @@ -1,6 +1,6 @@ .PHONY: all -all: alpine centos debian ubuntu kali-rolling +all: alpine centos clefos debian ubuntu kali-rolling alpine: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go1.13.6.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.alpine . -t ztbuild/alpine-arm64 --load @@ -20,6 +20,9 @@ centos: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go1.13.6.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.centos8 . -t ztbuild/centos8-arm64 --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go1.13.6.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.centos8 . -t ztbuild/centos8-ppc64le --load +clefos: + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go1.13.6.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.clefos-s390x . -t ztbuild/clefos-s390x --load + debian: debian-wheezy debian-jessie debian-buster debian-stretch debian-bullseye debian-sid debian-wheezy: