void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

docker & build parallelization

Browse source
This commit is contained in:
Grant Limberg 2020-06-24 09:57:38 -07:00
parent 02a810b8d6
commit ab36607a48
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Jenkinsfile vendored
View file

@ -186,7 +186,7 @@ def packageStatic() {
sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" 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' sh 'CMAKE_ARGS="-DBUILD_32BIT=1 -DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup'
dir("build") { dir("build") {
sh 'make package' sh 'make package -j4 VERBOSE=1'
} }
sh "mkdir -p ${distro}" sh "mkdir -p ${distro}"
sh "cp -av build/*.rpm ${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 "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier"
sh 'CMAKE_ARGS="-DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup' sh 'CMAKE_ARGS="-DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup'
dir("build") { dir("build") {
sh 'make package' sh 'make package -j4 VERBOSE=1'
} }
sh "mkdir -p ${distro}" sh "mkdir -p ${distro}"
sh "cp -av build/*.rpm ${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 "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier"
sh "${cmakeFlags} make setup" sh "${cmakeFlags} make setup"
dir("build") { dir("build") {
sh 'make package' sh 'make package -j4 VERBOSE=1'
} }
sh "mkdir -p ${distro}" sh "mkdir -p ${distro}"
sh "cp -av build/*.deb ${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 "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier"
sh "${cmakeFlags} make setup" sh "${cmakeFlags} make setup"
dir("build") { dir("build") {
sh 'make package' sh 'make package -j4 VERBOSE=1'
} }
sh "mkdir -p ${distro}" sh "mkdir -p ${distro}"
sh "cp -av build/*.deb ${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 "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier"
sh "${cmakeFlags} make setup" sh "${cmakeFlags} make setup"
dir("build") { dir("build") {
sh 'make package' sh 'make package -j4 VERBOSE=1'
} }
sh "mkdir -p ${distro}" sh "mkdir -p ${distro}"
sh "cp -av build/*.deb ${distro}/" sh "cp -av build/*.deb ${distro}/"
@ -397,7 +397,7 @@ def buildDebianNative() {
dir("build") { dir("build") {
sh "${cmakeFlags} make setup" sh "${cmakeFlags} make setup"
dir("build") { dir("build") {
sh "make package -j4" sh "make package -j4 VERBOSE=1"
} }
} }
sh "mkdir -p ${distro}" sh "mkdir -p ${distro}"
@ -467,9 +467,9 @@ def buildCentosNative() {
} }
dir ("build") { dir ("build") {
if (distro == 'centos7' && arch == 'amd64') { 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 { } else {
sh 'make package -j4' sh 'make package -j4 VERBOSE=1'
} }
} }
} }

4
dockerbuild/Dockerfile.debian-bullseye
View file

@ -2,10 +2,10 @@ FROM debian:bullseye-20191224
ARG go_pkg_url 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 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 WORKDIR /cmake-3.17.3
RUN ./bootstrap && make -j8 && make install RUN ./bootstrap --parallel=8 && make -j8 && make install
WORKDIR / WORKDIR /
RUN curl -s -k $go_pkg_url -o go.tar.gz && \ RUN curl -s -k $go_pkg_url -o go.tar.gz && \