From b2132aa9759cbfdd7650728b0d1e5cd4a5a1970d Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Tue, 16 Jun 2020 12:19:31 -0700
Subject: [PATCH 1/2] needs libssl dev

---
 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 558a855d1..937f89058 100644
--- a/dockerbuild/Dockerfile.debian-stretch
+++ b/dockerbuild/Dockerfile.debian-stretch
@@ -2,7 +2,7 @@ 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 apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd libssl-dev
 
 RUN curl -s -k -L $go_pkg_url -o go.tar.gz && \
     tar -C /usr/local -xzf go.tar.gz && \

From 0a2dfc719ac35040f730a7dba30c895a8f80a99c Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Tue, 16 Jun 2020 13:33:05 -0700
Subject: [PATCH 2/2] fix centos 7 & debian stretch

---
 Jenkinsfile                           | 2 +-
 dockerbuild/Dockerfile.centos7        | 2 +-
 dockerbuild/Dockerfile.debian-stretch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8bcd87e02..98d47ac5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -358,7 +358,7 @@ def buildCentosNative() {
                 def runtime = docker.image("ztbuild/${distro}-${arch}:latest")
                 runtime.inside {
                     dir("build") {
-                        if (distro == 'centos7') {
+                        if (distro == 'centos7' && arch == 'amd64') {
                             sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && make'
                         } else {
                             sh 'make'
diff --git a/dockerbuild/Dockerfile.centos7 b/dockerbuild/Dockerfile.centos7
index f02bda4e7..6f4579338 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 scl-utils 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 &&  yum install -y 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 && \
diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch
index 937f89058..f08f6e3af 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 ./bootstrap && make && make install
+RUN ./bootstrap && make -j8 && make install
 WORKDIR /