diff --git a/Jenkinsfile b/Jenkinsfile index a7fee27cb..21e4523d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -186,7 +186,7 @@ def packageStatic() { sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" sh 'CMAKE_ARGS="-DBUILD_32BIT=1 -DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup' dir("build") { - sh 'make package' + sh 'make package -j4 VERBOSE=1' } sh "mkdir -p ${distro}" sh "cp -av build/*.rpm ${distro}/" @@ -217,7 +217,7 @@ def packageStatic() { sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" sh 'CMAKE_ARGS="-DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup' dir("build") { - sh 'make package' + sh 'make package -j4 VERBOSE=1' } sh "mkdir -p ${distro}" sh "cp -av build/*.rpm ${distro}/" @@ -262,7 +262,7 @@ def packageStatic() { sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" sh "${cmakeFlags} make setup" dir("build") { - sh 'make package' + sh 'make package -j4 VERBOSE=1' } sh "mkdir -p ${distro}" sh "cp -av build/*.deb ${distro}/" @@ -306,7 +306,7 @@ def packageStatic() { sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" sh "${cmakeFlags} make setup" dir("build") { - sh 'make package' + sh 'make package -j4 VERBOSE=1' } sh "mkdir -p ${distro}" sh "cp -av build/*.deb ${distro}/" @@ -349,7 +349,7 @@ def packageStatic() { sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" sh "${cmakeFlags} make setup" dir("build") { - sh 'make package' + sh 'make package -j4 VERBOSE=1' } sh "mkdir -p ${distro}" sh "cp -av build/*.deb ${distro}/" @@ -397,7 +397,7 @@ def buildDebianNative() { dir("build") { sh "${cmakeFlags} make setup" dir("build") { - sh "make package -j4" + sh "make package -j4 VERBOSE=1" } } sh "mkdir -p ${distro}" @@ -467,9 +467,9 @@ def buildCentosNative() { } dir ("build") { if (distro == 'centos7' && arch == 'amd64') { - sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && make package -j4' + sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && make package -j4 VERBOSE=1' } else { - sh 'make package -j4' + sh 'make package -j4 VERBOSE=1' } } } diff --git a/dockerbuild/Dockerfile.debian-bullseye b/dockerbuild/Dockerfile.debian-bullseye index 887b0c701..dcaef18e2 100644 --- a/dockerbuild/Dockerfile.debian-bullseye +++ b/dockerbuild/Dockerfile.debian-bullseye @@ -2,10 +2,10 @@ 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 libssl-devel 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 -j8 && make install +RUN ./bootstrap --parallel=8 && make -j8 && make install WORKDIR / RUN curl -s -k $go_pkg_url -o go.tar.gz && \