Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

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'

linux-build-farm/fedora-22/x64/Dockerfile

@@ -0,0 +1,7 @@
+FROM fedora:22
+MAINTAINER Adam Ierymenko <[email protected]>
+
+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 /

linux-build-farm/fedora-22/x86/Dockerfile

@@ -0,0 +1,11 @@
+FROM nickcis/fedora-32:22
+MAINTAINER Adam Ierymenko <[email protected]>
+
+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 /