Browse Source

Bump version.

Adam Ierymenko 9 years ago
parent
commit
75fe981b9d

+ 42 - 0
linux-build-farm/build.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
+
+if [ $# = 0 ]; then
+	echo 'Usage: ./build.sh <distribution-name> [<distribution-name>] ...'
+	exit 1
+fi
+
+if [ ! -d ./ubuntu-trusty ]; then
+	echo 'Must run from linux-build-farm subfolder.'
+	exit 1
+fi
+
+rm -f zt1-src.tar.gz
+cd ..
+git archive --format=tar.gz --prefix=ZeroTierOne/ -o linux-build-farm/zt1-src.tar.gz HEAD
+cd linux-build-farm
+
+for distro in $*; do
+	cd $distro
+
+	cd x64
+	mv ../../zt1-src.tar.gz .
+	docker build -t zt1-build-${distro}-x64 .
+	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'
+
+	cd x86
+	mv ../../zt1-src.tar.gz .
+	docker build -t zt1-build-${distro}-x86 .
+	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'
+
+	cd ..
+done
+
+rm -f zt1-src.tar.gz

+ 10 - 0
linux-build-farm/debian-jessie/x64/Dockerfile

@@ -0,0 +1,10 @@
+FROM debian:jessie
+MAINTAINER Adam Ierymenko <[email protected]>
+
+RUN apt-get update
+RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.5
+
+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

+ 10 - 0
linux-build-farm/debian-jessie/x86/Dockerfile

@@ -0,0 +1,10 @@
+FROM 32bit/debian:jessie
+MAINTAINER Adam Ierymenko <[email protected]>
+
+RUN apt-get update
+RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.5
+
+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

+ 10 - 0
linux-build-farm/ubuntu-trusty/x64/Dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu:14.04
+MAINTAINER Adam Ierymenko <[email protected]>
+
+RUN apt-get update
+RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.6
+
+ADD zt1-src.tar.gz /
+
+RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++
+RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang

+ 10 - 0
linux-build-farm/ubuntu-trusty/x86/Dockerfile

@@ -0,0 +1,10 @@
+FROM 32bit/ubuntu:14.04
+MAINTAINER Adam Ierymenko <[email protected]>
+
+RUN apt-get update
+RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.6
+
+ADD zt1-src.tar.gz /
+
+RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++
+RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang

+ 1 - 1
version.h

@@ -32,6 +32,6 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 5
+#define ZEROTIER_ONE_VERSION_REVISION 6
 
 #endif