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

CentOS7 fixes.

Browse source
This commit is contained in:
Adam Ierymenko 2016-06-27 15:21:24 -07:00
parent 2d19fb7f8c
commit 809457599a
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/build.sh
View file

@ -8,10 +8,10 @@ fi
rm -f *.1 *.2 *.8 rm -f *.1 *.2 *.8
if [ -e /usr/bin/ronn ]; then if [ -e /usr/bin/ronn -o -e /usr/local/bin/ronn ]; then
/usr/bin/ronn -r zerotier-cli.1.md ronn -r zerotier-cli.1.md
/usr/bin/ronn -r zerotier-idtool.1.md ronn -r zerotier-idtool.1.md
/usr/bin/ronn -r zerotier-one.8.md ronn -r zerotier-one.8.md
else else
if [ ! -f /usr/bin/node -a ! -f /usr/bin/nodejs ]; then if [ ! -f /usr/bin/node -a ! -f /usr/bin/nodejs ]; then
echo 'Unable to build man pages: no /usr/bin/ronn or /usr/bin/node / nodejs!' echo 'Unable to build man pages: no /usr/bin/ronn or /usr/bin/node / nodejs!'

4
linux-build-farm/build.sh
View file

@ -31,7 +31,7 @@ for distro in $*; do
mv zt1-src.tar.gz ../.. mv zt1-src.tar.gz ../..
cd .. cd ..
# docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make `[ -f /etc/debian_version ] && echo debian || echo redhat` ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts' # docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make debian ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
cd x86 cd x86
mv ../../zt1-src.tar.gz . mv ../../zt1-src.tar.gz .
@ -39,7 +39,7 @@ for distro in $*; do
mv zt1-src.tar.gz ../.. mv zt1-src.tar.gz ../..
cd .. cd ..
# docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make `[ -f /etc/debian_version ] && echo debian || echo redhat` ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts' # docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make debian ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
cd .. cd ..
done done

3
linux-build-farm/centos-7/x64/Dockerfile
View file

@ -7,4 +7,7 @@ RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-deve
RUN yum install -y clang gcc-c++ RUN yum install -y clang gcc-c++
RUN yum install -y ruby ruby-devel
RUN gem install ronn
ADD zt1-src.tar.gz / ADD zt1-src.tar.gz /

3
linux-build-farm/centos-7/x86/Dockerfile
View file

@ -14,4 +14,7 @@
FROM zerotier/zt1-build-centos-7-x86-base FROM zerotier/zt1-build-centos-7-x86-base
MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
RUN yum install -y ruby ruby-devel
RUN gem install ronn
ADD zt1-src.tar.gz / ADD zt1-src.tar.gz /