diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-29 09:45:05 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-29 09:45:05 -0700 |
| commit | dbe57742e64f93e253dd60e4e4071871b1de9265 (patch) | |
| tree | 34ca3eb2536b45dfda111aecff7da375ad011f37 | |
| parent | 928c625e2cc3c5ee59dd5843a4f23a76511eb1c8 (diff) | |
| parent | 1e00603241b03e738039b910828139b4e305f525 (diff) | |
| download | infinitytier-dbe57742e64f93e253dd60e4e4071871b1de9265.tar.gz infinitytier-dbe57742e64f93e253dd60e4e4071871b1de9265.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
| -rwxr-xr-x | linux-build-farm/build.sh | 2 | ||||
| -rw-r--r-- | linux-build-farm/fedora-22/x64/Dockerfile | 7 | ||||
| -rw-r--r-- | linux-build-farm/fedora-22/x86/Dockerfile | 11 |
3 files changed, 20 insertions, 0 deletions
diff --git a/linux-build-farm/build.sh b/linux-build-farm/build.sh index da95c04c..468386ce 100755 --- a/linux-build-farm/build.sh +++ b/linux-build-farm/build.sh @@ -41,6 +41,8 @@ for distro in $subdirs; do rm -f *.deb *.rpm +# exit 0 + if [ ! -n "`echo $distro | grep -F debian`" -a ! -n "`echo $distro | grep -F ubuntu`" ]; then docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make redhat ; cd .. ; cp `find /root/rpmbuild -type f -name *.rpm` /artifacts ; ls -l /artifacts' docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make redhat ; cd .. ; cp `find /root/rpmbuild -type f -name *.rpm` /artifacts ; ls -l /artifacts' diff --git a/linux-build-farm/fedora-22/x64/Dockerfile b/linux-build-farm/fedora-22/x64/Dockerfile new file mode 100644 index 00000000..554ca338 --- /dev/null +++ b/linux-build-farm/fedora-22/x64/Dockerfile @@ -0,0 +1,7 @@ +FROM fedora:22 +MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> + +RUN yum update -y +RUN yum install -y make rpmdevtools gcc-c++ rubygem-ronn json-parser-devel lz4-devel http-parser-devel libnatpmp-devel + +ADD zt1-src.tar.gz / diff --git a/linux-build-farm/fedora-22/x86/Dockerfile b/linux-build-farm/fedora-22/x86/Dockerfile new file mode 100644 index 00000000..e4b546b4 --- /dev/null +++ b/linux-build-farm/fedora-22/x86/Dockerfile @@ -0,0 +1,11 @@ +FROM nickcis/fedora-32:22 +MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> + +RUN mkdir -p /etc/dnf/vars +RUN echo 'i386' >/etc/dnf/vars/basearch +RUN echo 'i386' >/etc/dnf/vars/arch + +RUN yum update -y +RUN yum install -y make rpmdevtools gcc-c++ rubygem-ronn json-parser-devel lz4-devel http-parser-devel libnatpmp-devel + +ADD zt1-src.tar.gz / |