diff options
| -rwxr-xr-x | linux-build-farm/build.sh | 2 | ||||
| -rw-r--r-- | linux-build-farm/ubuntu-wily/x64/Dockerfile | 10 | ||||
| -rw-r--r-- | linux-build-farm/ubuntu-wily/x86/Dockerfile | 10 | ||||
| -rw-r--r-- | make-linux.mk | 1 |
4 files changed, 23 insertions, 0 deletions
diff --git a/linux-build-farm/build.sh b/linux-build-farm/build.sh index b0526ceb..e42ddda6 100755 --- a/linux-build-farm/build.sh +++ b/linux-build-farm/build.sh @@ -20,6 +20,8 @@ cd linux-build-farm for distro in $*; do cd $distro + rm -f *.deb + cd x64 mv ../../zt1-src.tar.gz . docker build -t zt1-build-${distro}-x64 . diff --git a/linux-build-farm/ubuntu-wily/x64/Dockerfile b/linux-build-farm/ubuntu-wily/x64/Dockerfile new file mode 100644 index 00000000..91aafd7c --- /dev/null +++ b/linux-build-farm/ubuntu-wily/x64/Dockerfile @@ -0,0 +1,10 @@ +FROM ubuntu:wily +MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> + +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.7 + +ADD zt1-src.tar.gz / + +RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang diff --git a/linux-build-farm/ubuntu-wily/x86/Dockerfile b/linux-build-farm/ubuntu-wily/x86/Dockerfile new file mode 100644 index 00000000..551b349e --- /dev/null +++ b/linux-build-farm/ubuntu-wily/x86/Dockerfile @@ -0,0 +1,10 @@ +FROM daald/ubuntu32:wily +MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> + +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.7 + +ADD zt1-src.tar.gz / + +RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang diff --git a/make-linux.mk b/make-linux.mk index 52f7f625..303bdea4 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -142,6 +142,7 @@ doc: manpages clean: FORCE rm -rf *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend doc/*.1 doc/*.2 doc/*.8 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one + find linux-build-farm -type f -name '*.deb' -print0 | xargs -0 rm -fv distclean: clean rm -rf doc/node_modules |