CentOS7 fixes.

This commit is contained in:
Adam Ierymenko 2016-06-27 15:21:24 -07:00
commit 809457599a
4 changed files with 12 additions and 6 deletions

View file

@ -31,7 +31,7 @@ for distro in $*; do
mv zt1-src.tar.gz ../..
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
mv ../../zt1-src.tar.gz .
@ -39,7 +39,7 @@ for distro in $*; do
mv zt1-src.tar.gz ../..
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 ..
done

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 ruby ruby-devel
RUN gem install ronn
ADD zt1-src.tar.gz /

View file

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