diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 15:21:24 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 15:21:24 -0700 |
| commit | 809457599afb2fcc6692ce4f4719b6fe172a3f9b (patch) | |
| tree | e6473e48292b18a9c03fb3fee2ce870278fe39ac /linux-build-farm | |
| parent | 2d19fb7f8ce51b10fe8eb78fccb5b8f9ff76f524 (diff) | |
| download | infinitytier-809457599afb2fcc6692ce4f4719b6fe172a3f9b.tar.gz infinitytier-809457599afb2fcc6692ce4f4719b6fe172a3f9b.zip | |
CentOS7 fixes.
Diffstat (limited to 'linux-build-farm')
| -rwxr-xr-x | linux-build-farm/build.sh | 4 | ||||
| -rw-r--r-- | linux-build-farm/centos-7/x64/Dockerfile | 3 | ||||
| -rw-r--r-- | linux-build-farm/centos-7/x86/Dockerfile | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/linux-build-farm/build.sh b/linux-build-farm/build.sh index 1623e0c2..b6f593b4 100755 --- a/linux-build-farm/build.sh +++ b/linux-build-farm/build.sh @@ -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 diff --git a/linux-build-farm/centos-7/x64/Dockerfile b/linux-build-farm/centos-7/x64/Dockerfile index 3b764d28..a8e7335a 100644 --- a/linux-build-farm/centos-7/x64/Dockerfile +++ b/linux-build-farm/centos-7/x64/Dockerfile @@ -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 / diff --git a/linux-build-farm/centos-7/x86/Dockerfile b/linux-build-farm/centos-7/x86/Dockerfile index fe0744bc..99e077fd 100644 --- a/linux-build-farm/centos-7/x86/Dockerfile +++ b/linux-build-farm/centos-7/x86/Dockerfile @@ -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 / |