summaryrefslogtreecommitdiff
path: root/linux-build-farm
diff options
context:
space:
mode:
Diffstat (limited to 'linux-build-farm')
-rwxr-xr-xlinux-build-farm/build.sh4
-rw-r--r--linux-build-farm/centos-6/x64/Dockerfile11
-rw-r--r--linux-build-farm/centos-6/x86/Dockerfile11
-rw-r--r--linux-build-farm/centos-6/x86/zt1-src.tar.gzbin0 -> 11017265 bytes
4 files changed, 24 insertions, 2 deletions
diff --git a/linux-build-farm/build.sh b/linux-build-farm/build.sh
index 045ce995..1623e0c2 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 debian ; 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 `[ -f /etc/debian_version ] && echo debian || echo redhat` ; 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 debian ; 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 `[ -f /etc/debian_version ] && echo debian || echo redhat` ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
cd ..
done
diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile
new file mode 100644
index 00000000..10a2bf16
--- /dev/null
+++ b/linux-build-farm/centos-6/x64/Dockerfile
@@ -0,0 +1,11 @@
+FROM centos:6
+MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
+
+RUN yum update -y
+RUN yum install -y epel-release
+RUN yum install -y clang make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel
+
+ADD zt1-src.tar.gz /
+
+#RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
+#RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang
diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile
new file mode 100644
index 00000000..d9ea0f6e
--- /dev/null
+++ b/linux-build-farm/centos-6/x86/Dockerfile
@@ -0,0 +1,11 @@
+FROM toopher/centos-i386:centos6
+MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
+
+RUN yum update -y
+RUN yum install -y epel-release
+RUN yum install -y clang make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel
+
+ADD zt1-src.tar.gz /
+
+#RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
+#RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang
diff --git a/linux-build-farm/centos-6/x86/zt1-src.tar.gz b/linux-build-farm/centos-6/x86/zt1-src.tar.gz
new file mode 100644
index 00000000..43adb57d
--- /dev/null
+++ b/linux-build-farm/centos-6/x86/zt1-src.tar.gz
Binary files differ