From 5e6484ff5aaf690f9bb666d661ce7d90eed23344 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 09:08:26 -0700 Subject: [PATCH 01/11] add docker images for ubuntu 20.04 --- dockerbuild/Dockerfile.ubuntu-focal | 14 ++++++++++++++ dockerbuild/Makefile | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 dockerbuild/Dockerfile.ubuntu-focal diff --git a/dockerbuild/Dockerfile.ubuntu-focal b/dockerbuild/Dockerfile.ubuntu-focal new file mode 100644 index 000000000..b6ed3f1c1 --- /dev/null +++ b/dockerbuild/Dockerfile.ubuntu-focal @@ -0,0 +1,14 @@ +FROM ubuntu:focal-20200423 + +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 curl -s -k $go_pkg_url -o go.tar.gz && \ + tar -C /usr/local -xzf go.tar.gz && \ + rm go.tar.gz + +RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build +RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build +CMD ["/usr/bin/sshd", "-D"] + diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile index 47953f289..51a322492 100644 --- a/dockerbuild/Makefile +++ b/dockerbuild/Makefile @@ -72,7 +72,7 @@ debian-sid: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.debian-sid . -t ztbuild/debian-sid-ppc64le --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.debian-sid . -t ztbuild/debian-sid-s390x --load -ubuntu: ubuntu-trusty ubuntu-xenial ubuntu-bionic ubuntu-eoan +ubuntu: ubuntu-trusty ubuntu-xenial ubuntu-bionic ubuntu-eoan ubuntu-focal ubuntu-trusty: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-trusty . -t ztbuild/ubuntu-trusty-amd64 --load @@ -105,6 +105,13 @@ ubuntu-eoan: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-ppc64le --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-s390x --load +ubuntu-focal: + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-amd64 --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-arm64 --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-armhf --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-ppc64le --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-s390x --load + kali-rolling: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.kali-rolling . -t ztbuild/kali-rolling-amd64 --load From b919f5a95b5a88b8eaee75a9041b3c83cf9c70ca Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 09:46:42 -0700 Subject: [PATCH 02/11] helps to load the correct dockerfile --- dockerbuild/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile index 51a322492..ca37094e6 100644 --- a/dockerbuild/Makefile +++ b/dockerbuild/Makefile @@ -106,11 +106,11 @@ ubuntu-eoan: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-s390x --load ubuntu-focal: - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-amd64 --load - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-arm64 --load - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-armhf --load - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-ppc64le --load - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.ubuntu-eoan . -t ztbuild/ubuntu-eoan-s390x --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-amd64 --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-arm64 --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-armhf --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-ppc64le --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-s390x --load kali-rolling: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.kali-rolling . -t ztbuild/kali-rolling-amd64 --load From 3669cac3c97c9c1ae8c4c25b619a65c79599833a Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 09:50:16 -0700 Subject: [PATCH 03/11] apparently apt now asks for your region interactively. Even in a docker image --- dockerbuild/Dockerfile.ubuntu-focal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/Dockerfile.ubuntu-focal b/dockerbuild/Dockerfile.ubuntu-focal index b6ed3f1c1..6dc98a5c6 100644 --- a/dockerbuild/Dockerfile.ubuntu-focal +++ b/dockerbuild/Dockerfile.ubuntu-focal @@ -2,7 +2,7 @@ FROM ubuntu:focal-20200423 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 DEBIAN_FRONTEND=noninteractive apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ From 3f21e59ab4fb958a395c2920d0a33c124a8fcb11 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 09:53:42 -0700 Subject: [PATCH 04/11] more DEBIAN_FRONTEND=noninteractive --- dockerbuild/Dockerfile.ubuntu-focal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/Dockerfile.ubuntu-focal b/dockerbuild/Dockerfile.ubuntu-focal index 6dc98a5c6..4cca2cd9e 100644 --- a/dockerbuild/Dockerfile.ubuntu-focal +++ b/dockerbuild/Dockerfile.ubuntu-focal @@ -2,7 +2,7 @@ FROM ubuntu:focal-20200423 ARG go_pkg_url -RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd +RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd RUN curl -s -k $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ From 86d91cb625b5b0f515f589f6c19948969424f493 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 10:10:51 -0700 Subject: [PATCH 05/11] no ubuntu 20.04 for ArmV7 --- dockerbuild/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile index ca37094e6..b8e88bdfe 100644 --- a/dockerbuild/Makefile +++ b/dockerbuild/Makefile @@ -108,7 +108,6 @@ ubuntu-eoan: ubuntu-focal: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-amd64 --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-arm64 --load - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-armhf --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-ppc64le --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.ubuntu-focal . -t ztbuild/ubuntu-focal-s390x --load From e808b4b45f66faf1fc396e2808039ccc928c88a5 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 10:26:48 -0700 Subject: [PATCH 06/11] add ubuntu focal builds --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index fe519f191..e6a41ed0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -329,6 +329,15 @@ def buildDebianNative() { } tasks << getTasks(ubuntu, ubuntuArchs, build) + def ubuntuFocal = ["ubuntu-focal"] + def ubuntuFocalArchs = [] + if (params.BUILD_ALL == true) { + ubuntuFocalArchs = ["amd64", "armhf", "arm64", "ppc64le", "s390x"] + } else { + ubuntuFocalArchs = ["amd64"] + } + tasks << getTasks(ubuntuFocal, ubuntuFocalArchs, build) + def kali = ["kali-rolling"] def kaliArchs = ["amd64"] tasks << getTasks(kali, kaliArchs, build) From 77342f8571a1e4117446e319d426f6e5301bf8de Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 10:40:01 -0700 Subject: [PATCH 07/11] try setting scl_source on centos7 for newer compilers --- CMakeLists.txt | 3 ++- Jenkinsfile | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66c5cad89..a25ea78a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,8 @@ endif(WIN32) if ( CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR - CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" + CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR + CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64" ) message("++ Adding flags for processor ${CMAKE_SYSTEM_PROCESSOR}") add_compile_options(-maes -mrdrnd -mpclmul -msse -msse2 -mssse3) diff --git a/Jenkinsfile b/Jenkinsfile index e6a41ed0f..8bcd87e02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,6 +55,7 @@ def buildStaticBinaries() { def runtime = docker.image("ztbuild/${distro}-${platform}:latest") runtime.inside { dir("build") { + def cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1"' if (platform == "i386") { cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1"' @@ -357,7 +358,11 @@ def buildCentosNative() { def runtime = docker.image("ztbuild/${distro}-${arch}:latest") runtime.inside { dir("build") { - sh 'make -j4' + if (distro == 'centos7') { + sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && make' + } else { + sh 'make' + } // sh 'make redhat' // sh "mkdir -p ${distro}" // sh "cp -av `find ~/rpmbuild/ -type f -name \"*.rpm\"` ${distro}/" From 6c43e0b9460de062c3b6d789e0108a9a043b439f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 11:28:42 -0700 Subject: [PATCH 08/11] add scl-utils --- dockerbuild/Dockerfile.centos7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/Dockerfile.centos7 b/dockerbuild/Dockerfile.centos7 index 751d02c0c..f02bda4e7 100644 --- a/dockerbuild/Dockerfile.centos7 +++ b/dockerbuild/Dockerfile.centos7 @@ -3,7 +3,7 @@ FROM centos:7 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 yum install -y curl git wget openssh-server sudo make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel centos-release-scl scl-utils devtoolset-8 llvm-toolset-7 && yum clean all RUN curl -s $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ From 98ea27ecb0f20157f9334f495bde64ce1fca8ad0 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 11:59:08 -0700 Subject: [PATCH 09/11] have to build & install cmake on non-x64 versions of debian stretch --- dockerbuild/Dockerfile.debian-stretch | 10 +++++----- dockerbuild/Dockerfile.debian-stretch-x64 | 18 ++++++++++++++++++ dockerbuild/Makefile | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 dockerbuild/Dockerfile.debian-stretch-x64 diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch index cbc45c148..cc320668a 100644 --- a/dockerbuild/Dockerfile.debian-stretch +++ b/dockerbuild/Dockerfile.debian-stretch @@ -4,13 +4,13 @@ ARG go_pkg_url RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd -RUN curl -s -k $go_pkg_url -o go.tar.gz && \ +RUN curl -s -k -L $go_pkg_url -o go.tar.gz && \ tar -C /usr/local -xzf go.tar.gz && \ rm go.tar.gz -RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \ - chmod +x cmake.sh && \ - ./cmake.sh --skip-license --exclude-subdir && \ - rm cmake.sh +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 ./boostrap && make && make install + RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build diff --git a/dockerbuild/Dockerfile.debian-stretch-x64 b/dockerbuild/Dockerfile.debian-stretch-x64 new file mode 100644 index 000000000..cbc45c148 --- /dev/null +++ b/dockerbuild/Dockerfile.debian-stretch-x64 @@ -0,0 +1,18 @@ +FROM debian:stretch-20191224 + +ARG go_pkg_url + +RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd + +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 -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \ + chmod +x cmake.sh && \ + ./cmake.sh --skip-license --exclude-subdir && \ + rm cmake.sh + +RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build +RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build +CMD ["/usr/bin/sshd", "-D"] + diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile index b8e88bdfe..e566c74dc 100644 --- a/dockerbuild/Makefile +++ b/dockerbuild/Makefile @@ -46,7 +46,7 @@ debian-buster: @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-s390x.tar.gz" --platform linux/s390x -f Dockerfile.debian-buster . -t ztbuild/debian-buster-s390x --load debian-stretch: - @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-amd64 --load + @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.debian-stretch-x64 . -t ztbuild/debian-stretch-amd64 --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-arm64 --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v6 -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-armel --load @docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.debian-stretch . -t ztbuild/debian-stretch-armhf --load From 034188b0eef017d563347176358c91ebb541f149 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 12:07:20 -0700 Subject: [PATCH 10/11] reset WORKDIR back to root once built --- dockerbuild/Dockerfile.debian-stretch | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch index cc320668a..021d1a92b 100644 --- a/dockerbuild/Dockerfile.debian-stretch +++ b/dockerbuild/Dockerfile.debian-stretch @@ -10,6 +10,7 @@ RUN curl -s -k -L $go_pkg_url -o go.tar.gz && \ 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 ./boostrap && make && make install +WORKDIR / RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build From 7739984c56c96b4492306fdaab61cf4762673d86 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 16 Jun 2020 12:11:48 -0700 Subject: [PATCH 11/11] typo --- dockerbuild/Dockerfile.debian-stretch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch index 021d1a92b..558a855d1 100644 --- a/dockerbuild/Dockerfile.debian-stretch +++ b/dockerbuild/Dockerfile.debian-stretch @@ -9,7 +9,7 @@ RUN curl -s -k -L $go_pkg_url -o go.tar.gz && \ rm go.tar.gz 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 ./boostrap && make && make install +RUN ./bootstrap && make && make install WORKDIR /