Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge

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'

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

dockerbuild/Dockerfile.debian-stretch

@@ -2,14 +2,14 @@ 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 && \
     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 /