Add CMake to all the docker images

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

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

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

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

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 && \

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 && \

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 && \

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 && \

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
 

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 && \

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

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

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 && \

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 && \

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

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

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: