소스 검색

More Linux Docker build farm targets.

Adam Ierymenko 9 년 전
부모
커밋
9784393b15
4개의 변경된 파일23개의 추가작업 그리고 0개의 파일을 삭제
  1. 2 0
      linux-build-farm/build.sh
  2. 10 0
      linux-build-farm/ubuntu-wily/x64/Dockerfile
  3. 10 0
      linux-build-farm/ubuntu-wily/x86/Dockerfile
  4. 1 0
      make-linux.mk

+ 2 - 0
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 .

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

@@ -0,0 +1,10 @@
+FROM ubuntu:wily
+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.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

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

@@ -0,0 +1,10 @@
+FROM daald/ubuntu32:wily
+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.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

+ 1 - 0
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