From 6b5d6efe6c9d597c49b3fe57d6c40342b226556f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 23 Dec 2016 14:33:04 -0800 Subject: Retire old build farm (something new is coming) and update makefile for linux to not auto-build doc. --- attic/linux-build-farm/README.md | 8 +++ .../linux-build-farm/amazon-2016.03/x64/Dockerfile | 13 ++++ attic/linux-build-farm/build.sh | 69 ++++++++++++++++++++++ attic/linux-build-farm/centos-6/x64/Dockerfile | 13 ++++ attic/linux-build-farm/centos-6/x86/Dockerfile | 13 ++++ attic/linux-build-farm/centos-7/x64/Dockerfile | 10 ++++ attic/linux-build-farm/centos-7/x86/Dockerfile | 22 +++++++ .../linux-build-farm/debian-jessie/x64/Dockerfile | 12 ++++ .../linux-build-farm/debian-jessie/x86/Dockerfile | 12 ++++ .../linux-build-farm/debian-stretch/x64/Dockerfile | 12 ++++ .../linux-build-farm/debian-stretch/x86/Dockerfile | 12 ++++ .../linux-build-farm/debian-wheezy/x64/Dockerfile | 12 ++++ .../linux-build-farm/debian-wheezy/x86/Dockerfile | 15 +++++ attic/linux-build-farm/fedora-22/x64/Dockerfile | 10 ++++ attic/linux-build-farm/fedora-22/x86/Dockerfile | 19 ++++++ attic/linux-build-farm/make-apt-repos.sh | 16 +++++ attic/linux-build-farm/make-rpm-repos.sh | 64 ++++++++++++++++++++ .../other/zerotier-containerized/Dockerfile | 20 +++++++ .../other/zerotier-containerized/main.sh | 10 ++++ .../linux-build-farm/ubuntu-trusty/x64/Dockerfile | 12 ++++ .../linux-build-farm/ubuntu-trusty/x86/Dockerfile | 12 ++++ attic/linux-build-farm/ubuntu-wily/x64/Dockerfile | 12 ++++ attic/linux-build-farm/ubuntu-wily/x86/Dockerfile | 12 ++++ .../linux-build-farm/ubuntu-xenial/x64/Dockerfile | 14 +++++ .../linux-build-farm/ubuntu-xenial/x86/Dockerfile | 14 +++++ linux-build-farm/README.md | 8 --- linux-build-farm/amazon-2016.03/x64/Dockerfile | 13 ---- linux-build-farm/build.sh | 69 ---------------------- linux-build-farm/centos-6/x64/Dockerfile | 13 ---- linux-build-farm/centos-6/x86/Dockerfile | 13 ---- linux-build-farm/centos-7/x64/Dockerfile | 10 ---- linux-build-farm/centos-7/x86/Dockerfile | 22 ------- linux-build-farm/debian-jessie/x64/Dockerfile | 12 ---- linux-build-farm/debian-jessie/x86/Dockerfile | 12 ---- linux-build-farm/debian-stretch/x64/Dockerfile | 12 ---- linux-build-farm/debian-stretch/x86/Dockerfile | 12 ---- linux-build-farm/debian-wheezy/x64/Dockerfile | 12 ---- linux-build-farm/debian-wheezy/x86/Dockerfile | 15 ----- linux-build-farm/fedora-22/x64/Dockerfile | 10 ---- linux-build-farm/fedora-22/x86/Dockerfile | 19 ------ linux-build-farm/make-apt-repos.sh | 16 ----- linux-build-farm/make-rpm-repos.sh | 64 -------------------- .../other/zerotier-containerized/Dockerfile | 20 ------- .../other/zerotier-containerized/main.sh | 10 ---- linux-build-farm/ubuntu-trusty/x64/Dockerfile | 12 ---- linux-build-farm/ubuntu-trusty/x86/Dockerfile | 12 ---- linux-build-farm/ubuntu-wily/x64/Dockerfile | 12 ---- linux-build-farm/ubuntu-wily/x86/Dockerfile | 12 ---- linux-build-farm/ubuntu-xenial/x64/Dockerfile | 14 ----- linux-build-farm/ubuntu-xenial/x86/Dockerfile | 14 ----- make-linux.mk | 8 +-- 51 files changed, 440 insertions(+), 444 deletions(-) create mode 100644 attic/linux-build-farm/README.md create mode 100644 attic/linux-build-farm/amazon-2016.03/x64/Dockerfile create mode 100755 attic/linux-build-farm/build.sh create mode 100644 attic/linux-build-farm/centos-6/x64/Dockerfile create mode 100644 attic/linux-build-farm/centos-6/x86/Dockerfile create mode 100644 attic/linux-build-farm/centos-7/x64/Dockerfile create mode 100644 attic/linux-build-farm/centos-7/x86/Dockerfile create mode 100644 attic/linux-build-farm/debian-jessie/x64/Dockerfile create mode 100644 attic/linux-build-farm/debian-jessie/x86/Dockerfile create mode 100644 attic/linux-build-farm/debian-stretch/x64/Dockerfile create mode 100644 attic/linux-build-farm/debian-stretch/x86/Dockerfile create mode 100644 attic/linux-build-farm/debian-wheezy/x64/Dockerfile create mode 100644 attic/linux-build-farm/debian-wheezy/x86/Dockerfile create mode 100644 attic/linux-build-farm/fedora-22/x64/Dockerfile create mode 100644 attic/linux-build-farm/fedora-22/x86/Dockerfile create mode 100755 attic/linux-build-farm/make-apt-repos.sh create mode 100755 attic/linux-build-farm/make-rpm-repos.sh create mode 100644 attic/linux-build-farm/other/zerotier-containerized/Dockerfile create mode 100755 attic/linux-build-farm/other/zerotier-containerized/main.sh create mode 100644 attic/linux-build-farm/ubuntu-trusty/x64/Dockerfile create mode 100644 attic/linux-build-farm/ubuntu-trusty/x86/Dockerfile create mode 100644 attic/linux-build-farm/ubuntu-wily/x64/Dockerfile create mode 100644 attic/linux-build-farm/ubuntu-wily/x86/Dockerfile create mode 100644 attic/linux-build-farm/ubuntu-xenial/x64/Dockerfile create mode 100644 attic/linux-build-farm/ubuntu-xenial/x86/Dockerfile delete mode 100644 linux-build-farm/README.md delete mode 100644 linux-build-farm/amazon-2016.03/x64/Dockerfile delete mode 100755 linux-build-farm/build.sh delete mode 100644 linux-build-farm/centos-6/x64/Dockerfile delete mode 100644 linux-build-farm/centos-6/x86/Dockerfile delete mode 100644 linux-build-farm/centos-7/x64/Dockerfile delete mode 100644 linux-build-farm/centos-7/x86/Dockerfile delete mode 100644 linux-build-farm/debian-jessie/x64/Dockerfile delete mode 100644 linux-build-farm/debian-jessie/x86/Dockerfile delete mode 100644 linux-build-farm/debian-stretch/x64/Dockerfile delete mode 100644 linux-build-farm/debian-stretch/x86/Dockerfile delete mode 100644 linux-build-farm/debian-wheezy/x64/Dockerfile delete mode 100644 linux-build-farm/debian-wheezy/x86/Dockerfile delete mode 100644 linux-build-farm/fedora-22/x64/Dockerfile delete mode 100644 linux-build-farm/fedora-22/x86/Dockerfile delete mode 100755 linux-build-farm/make-apt-repos.sh delete mode 100755 linux-build-farm/make-rpm-repos.sh delete mode 100644 linux-build-farm/other/zerotier-containerized/Dockerfile delete mode 100755 linux-build-farm/other/zerotier-containerized/main.sh delete mode 100644 linux-build-farm/ubuntu-trusty/x64/Dockerfile delete mode 100644 linux-build-farm/ubuntu-trusty/x86/Dockerfile delete mode 100644 linux-build-farm/ubuntu-wily/x64/Dockerfile delete mode 100644 linux-build-farm/ubuntu-wily/x86/Dockerfile delete mode 100644 linux-build-farm/ubuntu-xenial/x64/Dockerfile delete mode 100644 linux-build-farm/ubuntu-xenial/x86/Dockerfile diff --git a/attic/linux-build-farm/README.md b/attic/linux-build-farm/README.md new file mode 100644 index 00000000..8055eb0b --- /dev/null +++ b/attic/linux-build-farm/README.md @@ -0,0 +1,8 @@ +Dockerized Linux Build Farm +====== + +This subfolder contains Dockerfiles and a script to build Linux packages for a variety of Linux distributions. It's also an excellent way to test your CPU fans and stress test your disk. + +Running `build.sh` with no arguments builds everything. You can run `build.sh` with the name of a distro (e.g. centos-7) to only build that. Both 32 and 64 bit packages are built except where no 32-bit version of the distribution exists. + +The `make-apt-repos.sh` and `make-rpm-repos.sh` scripts build repositories. They may require some editing for outside-of-ZeroTier use, and be careful with the apt one if you have an existing *aptly* configuration. diff --git a/attic/linux-build-farm/amazon-2016.03/x64/Dockerfile b/attic/linux-build-farm/amazon-2016.03/x64/Dockerfile new file mode 100644 index 00000000..bd1a246a --- /dev/null +++ b/attic/linux-build-farm/amazon-2016.03/x64/Dockerfile @@ -0,0 +1,13 @@ +#FROM ambakshi/amazon-linux:2016.03 +#MAINTAINER Adam Ierymenko + +#RUN yum update -y +#RUN yum install -y epel-release +#RUN yum install -y make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel + +#RUN gem install ronn + +FROM zerotier/zt1-build-amazon-2016.03-x64-base +MAINTAINER Adam Ierymenko + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/build.sh b/attic/linux-build-farm/build.sh new file mode 100755 index 00000000..0eb7c5d2 --- /dev/null +++ b/attic/linux-build-farm/build.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +export PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin + +subdirs=$* +if [ ! -n "$subdirs" ]; then + subdirs=`find . -type d -name '*-*' -printf '%f '` +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 + +# Note that --privileged is used so we can bind mount VM shares when building in a VM. +# It has no other impact or purpose, but probably doesn't matter here in any case. + +for distro in $subdirs; do + echo + echo "--- BUILDING FOR $distro ---" + echo + + cd $distro + + if [ -d x64 ]; then + cd x64 + mv ../../zt1-src.tar.gz . + docker build -t zt1-build-${distro}-x64 . + mv zt1-src.tar.gz ../.. + cd .. + fi + + if [ -d x86 ]; then + cd x86 + mv ../../zt1-src.tar.gz . + docker build -t zt1-build-${distro}-x86 . + mv zt1-src.tar.gz ../.. + cd .. + fi + + rm -f *.deb *.rpm + +# exit 0 + + if [ ! -n "`echo $distro | grep -F debian`" -a ! -n "`echo $distro | grep -F ubuntu`" ]; then + if [ -d x64 ]; 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' + fi + if [ -d x86 ]; then + 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' + fi + else + if [ -d x64 ]; then + 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' + fi + if [ -d x86 ]; then + 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' + fi + fi + + cd .. +done + +rm -f zt1-src.tar.gz diff --git a/attic/linux-build-farm/centos-6/x64/Dockerfile b/attic/linux-build-farm/centos-6/x64/Dockerfile new file mode 100644 index 00000000..2796e422 --- /dev/null +++ b/attic/linux-build-farm/centos-6/x64/Dockerfile @@ -0,0 +1,13 @@ +FROM centos:6 +MAINTAINER Adam Ierymenko + +RUN yum update -y +RUN yum install -y epel-release +RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar + +RUN yum install -y nodejs npm + +# Stop use of http-parser-devel which is installed by nodejs/npm +RUN rm -f /usr/include/http_parser.h + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/centos-6/x86/Dockerfile b/attic/linux-build-farm/centos-6/x86/Dockerfile new file mode 100644 index 00000000..8192d139 --- /dev/null +++ b/attic/linux-build-farm/centos-6/x86/Dockerfile @@ -0,0 +1,13 @@ +FROM toopher/centos-i386:centos6 +MAINTAINER Adam Ierymenko + +RUN yum update -y +RUN yum install -y epel-release +RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar + +RUN yum install -y nodejs npm + +# Stop use of http-parser-devel which is installed by nodejs/npm +RUN rm -f /usr/include/http_parser.h + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/centos-7/x64/Dockerfile b/attic/linux-build-farm/centos-7/x64/Dockerfile new file mode 100644 index 00000000..10b58402 --- /dev/null +++ b/attic/linux-build-farm/centos-7/x64/Dockerfile @@ -0,0 +1,10 @@ +FROM centos:7 +MAINTAINER Adam Ierymenko + +RUN yum update -y +RUN yum install -y epel-release +RUN yum install -y make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel + +RUN gem install ronn + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/centos-7/x86/Dockerfile b/attic/linux-build-farm/centos-7/x86/Dockerfile new file mode 100644 index 00000000..a637a8d3 --- /dev/null +++ b/attic/linux-build-farm/centos-7/x86/Dockerfile @@ -0,0 +1,22 @@ +#FROM zerotier/centos7-32bit +#MAINTAINER Adam Ierymenko + +#RUN echo 'i686-redhat-linux' >/etc/rpm/platform + +#RUN yum update -y +#RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel + +#RUN yum install -y gcc-c++ +#RUN rpm --install --force https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm +#RUN rpm --install --force ftp://rpmfind.net/linux/centos/6.8/os/i386/Packages/libffi-3.0.5-3.2.el6.i686.rpm +#RUN yum install -y clang + +FROM zerotier/zt1-build-centos-7-x86-base +MAINTAINER Adam Ierymenko + +RUN yum install -y ruby ruby-devel +RUN gem install ronn + +#RUN rpm --erase http-parser-devel lz4-devel libnatpmp-devel + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/debian-jessie/x64/Dockerfile b/attic/linux-build-farm/debian-jessie/x64/Dockerfile new file mode 100644 index 00000000..316c1d83 --- /dev/null +++ b/attic/linux-build-farm/debian-jessie/x64/Dockerfile @@ -0,0 +1,12 @@ +FROM debian:jessie +MAINTAINER Adam Ierymenko + +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 + +RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/debian-jessie/x86/Dockerfile b/attic/linux-build-farm/debian-jessie/x86/Dockerfile new file mode 100644 index 00000000..3ad83329 --- /dev/null +++ b/attic/linux-build-farm/debian-jessie/x86/Dockerfile @@ -0,0 +1,12 @@ +FROM 32bit/debian:jessie +MAINTAINER Adam Ierymenko + +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 + +RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/debian-stretch/x64/Dockerfile b/attic/linux-build-farm/debian-stretch/x64/Dockerfile new file mode 100644 index 00000000..c973c2b7 --- /dev/null +++ b/attic/linux-build-farm/debian-stretch/x64/Dockerfile @@ -0,0 +1,12 @@ +FROM debian:stretch +MAINTAINER Adam Ierymenko + +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 + +#RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ +#RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/debian-stretch/x86/Dockerfile b/attic/linux-build-farm/debian-stretch/x86/Dockerfile new file mode 100644 index 00000000..bfc7a86f --- /dev/null +++ b/attic/linux-build-farm/debian-stretch/x86/Dockerfile @@ -0,0 +1,12 @@ +FROM mcandre/docker-debian-32bit:stretch +MAINTAINER Adam Ierymenko + +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 + +#RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ +#RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/debian-wheezy/x64/Dockerfile b/attic/linux-build-farm/debian-wheezy/x64/Dockerfile new file mode 100644 index 00000000..77e1c325 --- /dev/null +++ b/attic/linux-build-farm/debian-wheezy/x64/Dockerfile @@ -0,0 +1,12 @@ +FROM debian:wheezy +MAINTAINER Adam Ierymenko + +RUN apt-get update +RUN apt-get install -y build-essential debhelper ruby-ronn g++ make devscripts + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / + +RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control +RUN mv -f /ZeroTierOne/debian/rules.wheezy /ZeroTierOne/debian/rules diff --git a/attic/linux-build-farm/debian-wheezy/x86/Dockerfile b/attic/linux-build-farm/debian-wheezy/x86/Dockerfile new file mode 100644 index 00000000..1f0117d2 --- /dev/null +++ b/attic/linux-build-farm/debian-wheezy/x86/Dockerfile @@ -0,0 +1,15 @@ +#FROM tubia/debian:wheezy +#MAINTAINER Adam Ierymenko + +#RUN apt-get update +#RUN apt-get install -y build-essential debhelper ruby-ronn g++ make devscripts + +FROM zerotier/zt1-build-debian-wheezy-x86-base +MAINTAINER Adam Ierymenko + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / + +RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control +RUN mv -f /ZeroTierOne/debian/rules.wheezy /ZeroTierOne/debian/rules diff --git a/attic/linux-build-farm/fedora-22/x64/Dockerfile b/attic/linux-build-farm/fedora-22/x64/Dockerfile new file mode 100644 index 00000000..6da0a921 --- /dev/null +++ b/attic/linux-build-farm/fedora-22/x64/Dockerfile @@ -0,0 +1,10 @@ +FROM fedora:22 +MAINTAINER Adam Ierymenko + +RUN yum update -y +RUN yum install -y make rpmdevtools gcc-c++ rubygem-ronn json-parser-devel lz4-devel http-parser-devel libnatpmp-devel + +RUN rpm --erase http-parser-devel +RUN yum install -y rubygem-ronn ruby + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/fedora-22/x86/Dockerfile b/attic/linux-build-farm/fedora-22/x86/Dockerfile new file mode 100644 index 00000000..3c24b844 --- /dev/null +++ b/attic/linux-build-farm/fedora-22/x86/Dockerfile @@ -0,0 +1,19 @@ +#FROM nickcis/fedora-32:22 +#MAINTAINER Adam Ierymenko + +#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 + +FROM zerotier/zt1-build-fedora-22-x86-base +MAINTAINER Adam Ierymenko + +RUN echo 'i686-redhat-linux' >/etc/rpm/platform + +RUN rpm --erase http-parser-devel +RUN yum install -y rubygem-ronn ruby + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/make-apt-repos.sh b/attic/linux-build-farm/make-apt-repos.sh new file mode 100755 index 00000000..7a81cc5c --- /dev/null +++ b/attic/linux-build-farm/make-apt-repos.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# This builds a series of Debian repositories for each distribution. + +export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin + +for distro in debian-* ubuntu-*; do + if [ -n "`find ${distro} -name '*.deb' -type f`" ]; then + arches=`ls ${distro}/*.deb | cut -d _ -f 3 | cut -d . -f 1 | xargs | sed 's/ /,/g'` + distro_name=`echo $distro | cut -d '-' -f 2` + echo '---' $distro / $distro_name / $arches + aptly repo create -architectures=${arches} -comment="ZeroTier, Inc. Debian Packages" -component="main" -distribution=${distro_name} zt-release-${distro_name} + aptly repo add zt-release-${distro_name} ${distro}/*.deb + aptly publish repo zt-release-${distro_name} $distro_name + fi +done diff --git a/attic/linux-build-farm/make-rpm-repos.sh b/attic/linux-build-farm/make-rpm-repos.sh new file mode 100755 index 00000000..0ed1cfe4 --- /dev/null +++ b/attic/linux-build-farm/make-rpm-repos.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin + +GPG_KEY=contact@zerotier.com + +rm -rf /tmp/zt-rpm-repo +mkdir /tmp/zt-rpm-repo + +for distro in centos-* fedora-* amazon-*; do + dname=`echo $distro | cut -d '-' -f 1` + if [ "$dname" = "centos" ]; then + dname=el + fi + if [ "$dname" = "fedora" ]; then + dname=fc + fi + if [ "$dname" = "amazon" ]; then + dname=amzn1 + fi + dvers=`echo $distro | cut -d '-' -f 2` + + mkdir -p /tmp/zt-rpm-repo/$dname/$dvers + + cp -v $distro/*.rpm /tmp/zt-rpm-repo/$dname/$dvers +done + +rpmsign --resign --key-id=$GPG_KEY --digest-algo=sha256 `find /tmp/zt-rpm-repo -type f -name '*.rpm'` + +for db in `find /tmp/zt-rpm-repo -mindepth 2 -maxdepth 2 -type d`; do + createrepo --database $db +done + +# Stupid RHEL stuff +cd /tmp/zt-rpm-repo/el +ln -sf 6 6Client +ln -sf 6 6Workstation +ln -sf 6 6Server +ln -sf 6 6.0 +ln -sf 6 6.1 +ln -sf 6 6.2 +ln -sf 6 6.3 +ln -sf 6 6.4 +ln -sf 6 6.5 +ln -sf 6 6.6 +ln -sf 6 6.7 +ln -sf 6 6.8 +ln -sf 6 6.9 +ln -sf 7 7Client +ln -sf 7 7Workstation +ln -sf 7 7Server +ln -sf 7 7.0 +ln -sf 7 7.1 +ln -sf 7 7.2 +ln -sf 7 7.3 +ln -sf 7 7.4 +ln -sf 7 7.5 +ln -sf 7 7.6 +ln -sf 7 7.7 +ln -sf 7 7.8 +ln -sf 7 7.9 + +echo +echo Repo created in /tmp/zt-rpm-repo diff --git a/attic/linux-build-farm/other/zerotier-containerized/Dockerfile b/attic/linux-build-farm/other/zerotier-containerized/Dockerfile new file mode 100644 index 00000000..678216da --- /dev/null +++ b/attic/linux-build-farm/other/zerotier-containerized/Dockerfile @@ -0,0 +1,20 @@ +FROM alpine:latest +MAINTAINER Adam Ierymenko + +LABEL version="1.1.14" +LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts." + +# Uncomment to build in container +#RUN apk add --update alpine-sdk linux-headers + +RUN apk add --update libgcc libstdc++ + +ADD zerotier-one / +RUN chmod 0755 /zerotier-one +RUN ln -sf /zerotier-one /zerotier-cli +RUN mkdir -p /var/lib/zerotier-one + +ADD main.sh / +RUN chmod 0755 /main.sh + +ENTRYPOINT /main.sh diff --git a/attic/linux-build-farm/other/zerotier-containerized/main.sh b/attic/linux-build-farm/other/zerotier-containerized/main.sh new file mode 100755 index 00000000..685a6891 --- /dev/null +++ b/attic/linux-build-farm/other/zerotier-containerized/main.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin + +if [ ! -e /dev/net/tun ]; then + echo 'FATAL: cannot start ZeroTier One in container: /dev/net/tun not present.' + exit 1 +fi + +exec /zerotier-one diff --git a/attic/linux-build-farm/ubuntu-trusty/x64/Dockerfile b/attic/linux-build-farm/ubuntu-trusty/x64/Dockerfile new file mode 100644 index 00000000..f84cc6e3 --- /dev/null +++ b/attic/linux-build-farm/ubuntu-trusty/x64/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:14.04 +MAINTAINER Adam Ierymenko + +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 + +RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/ubuntu-trusty/x86/Dockerfile b/attic/linux-build-farm/ubuntu-trusty/x86/Dockerfile new file mode 100644 index 00000000..6be3ae87 --- /dev/null +++ b/attic/linux-build-farm/ubuntu-trusty/x86/Dockerfile @@ -0,0 +1,12 @@ +FROM 32bit/ubuntu:14.04 +MAINTAINER Adam Ierymenko + +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 + +RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/ubuntu-wily/x64/Dockerfile b/attic/linux-build-farm/ubuntu-wily/x64/Dockerfile new file mode 100644 index 00000000..99b8d34c --- /dev/null +++ b/attic/linux-build-farm/ubuntu-wily/x64/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:wily +MAINTAINER Adam Ierymenko + +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 + +RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/ubuntu-wily/x86/Dockerfile b/attic/linux-build-farm/ubuntu-wily/x86/Dockerfile new file mode 100644 index 00000000..86ad14f2 --- /dev/null +++ b/attic/linux-build-farm/ubuntu-wily/x86/Dockerfile @@ -0,0 +1,12 @@ +FROM daald/ubuntu32:wily +MAINTAINER Adam Ierymenko + +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 + +RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++ +RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/ubuntu-xenial/x64/Dockerfile b/attic/linux-build-farm/ubuntu-xenial/x64/Dockerfile new file mode 100644 index 00000000..fa665a0a --- /dev/null +++ b/attic/linux-build-farm/ubuntu-xenial/x64/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:xenial +MAINTAINER Adam Ierymenko + +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.8 + +#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ +#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang + +RUN rm -f /usr/bin/clang++ /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/attic/linux-build-farm/ubuntu-xenial/x86/Dockerfile b/attic/linux-build-farm/ubuntu-xenial/x86/Dockerfile new file mode 100644 index 00000000..d01eec9b --- /dev/null +++ b/attic/linux-build-farm/ubuntu-xenial/x86/Dockerfile @@ -0,0 +1,14 @@ +FROM f69m/ubuntu32:xenial +MAINTAINER Adam Ierymenko + +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.8 + +#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ +#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang + +RUN rm -f /usr/bin/clang++ /usr/bin/clang + +RUN dpkg --purge libhttp-parser-dev + +ADD zt1-src.tar.gz / diff --git a/linux-build-farm/README.md b/linux-build-farm/README.md deleted file mode 100644 index 8055eb0b..00000000 --- a/linux-build-farm/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Dockerized Linux Build Farm -====== - -This subfolder contains Dockerfiles and a script to build Linux packages for a variety of Linux distributions. It's also an excellent way to test your CPU fans and stress test your disk. - -Running `build.sh` with no arguments builds everything. You can run `build.sh` with the name of a distro (e.g. centos-7) to only build that. Both 32 and 64 bit packages are built except where no 32-bit version of the distribution exists. - -The `make-apt-repos.sh` and `make-rpm-repos.sh` scripts build repositories. They may require some editing for outside-of-ZeroTier use, and be careful with the apt one if you have an existing *aptly* configuration. diff --git a/linux-build-farm/amazon-2016.03/x64/Dockerfile b/linux-build-farm/amazon-2016.03/x64/Dockerfile deleted file mode 100644 index bd1a246a..00000000 --- a/linux-build-farm/amazon-2016.03/x64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -#FROM ambakshi/amazon-linux:2016.03 -#MAINTAINER Adam Ierymenko - -#RUN yum update -y -#RUN yum install -y epel-release -#RUN yum install -y make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel - -#RUN gem install ronn - -FROM zerotier/zt1-build-amazon-2016.03-x64-base -MAINTAINER Adam Ierymenko - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/build.sh b/linux-build-farm/build.sh deleted file mode 100755 index 0eb7c5d2..00000000 --- a/linux-build-farm/build.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -export PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - -subdirs=$* -if [ ! -n "$subdirs" ]; then - subdirs=`find . -type d -name '*-*' -printf '%f '` -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 - -# Note that --privileged is used so we can bind mount VM shares when building in a VM. -# It has no other impact or purpose, but probably doesn't matter here in any case. - -for distro in $subdirs; do - echo - echo "--- BUILDING FOR $distro ---" - echo - - cd $distro - - if [ -d x64 ]; then - cd x64 - mv ../../zt1-src.tar.gz . - docker build -t zt1-build-${distro}-x64 . - mv zt1-src.tar.gz ../.. - cd .. - fi - - if [ -d x86 ]; then - cd x86 - mv ../../zt1-src.tar.gz . - docker build -t zt1-build-${distro}-x86 . - mv zt1-src.tar.gz ../.. - cd .. - fi - - rm -f *.deb *.rpm - -# exit 0 - - if [ ! -n "`echo $distro | grep -F debian`" -a ! -n "`echo $distro | grep -F ubuntu`" ]; then - if [ -d x64 ]; 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' - fi - if [ -d x86 ]; then - 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' - fi - else - if [ -d x64 ]; then - 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' - fi - if [ -d x86 ]; then - 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' - fi - fi - - cd .. -done - -rm -f zt1-src.tar.gz diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile deleted file mode 100644 index 2796e422..00000000 --- a/linux-build-farm/centos-6/x64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM centos:6 -MAINTAINER Adam Ierymenko - -RUN yum update -y -RUN yum install -y epel-release -RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar - -RUN yum install -y nodejs npm - -# Stop use of http-parser-devel which is installed by nodejs/npm -RUN rm -f /usr/include/http_parser.h - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile deleted file mode 100644 index 8192d139..00000000 --- a/linux-build-farm/centos-6/x86/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM toopher/centos-i386:centos6 -MAINTAINER Adam Ierymenko - -RUN yum update -y -RUN yum install -y epel-release -RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar - -RUN yum install -y nodejs npm - -# Stop use of http-parser-devel which is installed by nodejs/npm -RUN rm -f /usr/include/http_parser.h - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/centos-7/x64/Dockerfile b/linux-build-farm/centos-7/x64/Dockerfile deleted file mode 100644 index 10b58402..00000000 --- a/linux-build-farm/centos-7/x64/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM centos:7 -MAINTAINER Adam Ierymenko - -RUN yum update -y -RUN yum install -y epel-release -RUN yum install -y make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel - -RUN gem install ronn - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/centos-7/x86/Dockerfile b/linux-build-farm/centos-7/x86/Dockerfile deleted file mode 100644 index a637a8d3..00000000 --- a/linux-build-farm/centos-7/x86/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -#FROM zerotier/centos7-32bit -#MAINTAINER Adam Ierymenko - -#RUN echo 'i686-redhat-linux' >/etc/rpm/platform - -#RUN yum update -y -#RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel - -#RUN yum install -y gcc-c++ -#RUN rpm --install --force https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm -#RUN rpm --install --force ftp://rpmfind.net/linux/centos/6.8/os/i386/Packages/libffi-3.0.5-3.2.el6.i686.rpm -#RUN yum install -y clang - -FROM zerotier/zt1-build-centos-7-x86-base -MAINTAINER Adam Ierymenko - -RUN yum install -y ruby ruby-devel -RUN gem install ronn - -#RUN rpm --erase http-parser-devel lz4-devel libnatpmp-devel - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/debian-jessie/x64/Dockerfile b/linux-build-farm/debian-jessie/x64/Dockerfile deleted file mode 100644 index 316c1d83..00000000 --- a/linux-build-farm/debian-jessie/x64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM debian:jessie -MAINTAINER Adam Ierymenko - -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 - -RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/debian-jessie/x86/Dockerfile b/linux-build-farm/debian-jessie/x86/Dockerfile deleted file mode 100644 index 3ad83329..00000000 --- a/linux-build-farm/debian-jessie/x86/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM 32bit/debian:jessie -MAINTAINER Adam Ierymenko - -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 - -RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/debian-stretch/x64/Dockerfile b/linux-build-farm/debian-stretch/x64/Dockerfile deleted file mode 100644 index c973c2b7..00000000 --- a/linux-build-farm/debian-stretch/x64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM debian:stretch -MAINTAINER Adam Ierymenko - -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 - -#RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ -#RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/debian-stretch/x86/Dockerfile b/linux-build-farm/debian-stretch/x86/Dockerfile deleted file mode 100644 index bfc7a86f..00000000 --- a/linux-build-farm/debian-stretch/x86/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM mcandre/docker-debian-32bit:stretch -MAINTAINER Adam Ierymenko - -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 - -#RUN ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++ -#RUN ln -sf /usr/bin/clang-3.5 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/debian-wheezy/x64/Dockerfile b/linux-build-farm/debian-wheezy/x64/Dockerfile deleted file mode 100644 index 77e1c325..00000000 --- a/linux-build-farm/debian-wheezy/x64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM debian:wheezy -MAINTAINER Adam Ierymenko - -RUN apt-get update -RUN apt-get install -y build-essential debhelper ruby-ronn g++ make devscripts - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / - -RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control -RUN mv -f /ZeroTierOne/debian/rules.wheezy /ZeroTierOne/debian/rules diff --git a/linux-build-farm/debian-wheezy/x86/Dockerfile b/linux-build-farm/debian-wheezy/x86/Dockerfile deleted file mode 100644 index 1f0117d2..00000000 --- a/linux-build-farm/debian-wheezy/x86/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -#FROM tubia/debian:wheezy -#MAINTAINER Adam Ierymenko - -#RUN apt-get update -#RUN apt-get install -y build-essential debhelper ruby-ronn g++ make devscripts - -FROM zerotier/zt1-build-debian-wheezy-x86-base -MAINTAINER Adam Ierymenko - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / - -RUN mv -f /ZeroTierOne/debian/control.wheezy /ZeroTierOne/debian/control -RUN mv -f /ZeroTierOne/debian/rules.wheezy /ZeroTierOne/debian/rules diff --git a/linux-build-farm/fedora-22/x64/Dockerfile b/linux-build-farm/fedora-22/x64/Dockerfile deleted file mode 100644 index 6da0a921..00000000 --- a/linux-build-farm/fedora-22/x64/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM fedora:22 -MAINTAINER Adam Ierymenko - -RUN yum update -y -RUN yum install -y make rpmdevtools gcc-c++ rubygem-ronn json-parser-devel lz4-devel http-parser-devel libnatpmp-devel - -RUN rpm --erase http-parser-devel -RUN yum install -y rubygem-ronn ruby - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/fedora-22/x86/Dockerfile b/linux-build-farm/fedora-22/x86/Dockerfile deleted file mode 100644 index 3c24b844..00000000 --- a/linux-build-farm/fedora-22/x86/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -#FROM nickcis/fedora-32:22 -#MAINTAINER Adam Ierymenko - -#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 - -FROM zerotier/zt1-build-fedora-22-x86-base -MAINTAINER Adam Ierymenko - -RUN echo 'i686-redhat-linux' >/etc/rpm/platform - -RUN rpm --erase http-parser-devel -RUN yum install -y rubygem-ronn ruby - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/make-apt-repos.sh b/linux-build-farm/make-apt-repos.sh deleted file mode 100755 index 7a81cc5c..00000000 --- a/linux-build-farm/make-apt-repos.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# This builds a series of Debian repositories for each distribution. - -export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin - -for distro in debian-* ubuntu-*; do - if [ -n "`find ${distro} -name '*.deb' -type f`" ]; then - arches=`ls ${distro}/*.deb | cut -d _ -f 3 | cut -d . -f 1 | xargs | sed 's/ /,/g'` - distro_name=`echo $distro | cut -d '-' -f 2` - echo '---' $distro / $distro_name / $arches - aptly repo create -architectures=${arches} -comment="ZeroTier, Inc. Debian Packages" -component="main" -distribution=${distro_name} zt-release-${distro_name} - aptly repo add zt-release-${distro_name} ${distro}/*.deb - aptly publish repo zt-release-${distro_name} $distro_name - fi -done diff --git a/linux-build-farm/make-rpm-repos.sh b/linux-build-farm/make-rpm-repos.sh deleted file mode 100755 index 0ed1cfe4..00000000 --- a/linux-build-farm/make-rpm-repos.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin - -GPG_KEY=contact@zerotier.com - -rm -rf /tmp/zt-rpm-repo -mkdir /tmp/zt-rpm-repo - -for distro in centos-* fedora-* amazon-*; do - dname=`echo $distro | cut -d '-' -f 1` - if [ "$dname" = "centos" ]; then - dname=el - fi - if [ "$dname" = "fedora" ]; then - dname=fc - fi - if [ "$dname" = "amazon" ]; then - dname=amzn1 - fi - dvers=`echo $distro | cut -d '-' -f 2` - - mkdir -p /tmp/zt-rpm-repo/$dname/$dvers - - cp -v $distro/*.rpm /tmp/zt-rpm-repo/$dname/$dvers -done - -rpmsign --resign --key-id=$GPG_KEY --digest-algo=sha256 `find /tmp/zt-rpm-repo -type f -name '*.rpm'` - -for db in `find /tmp/zt-rpm-repo -mindepth 2 -maxdepth 2 -type d`; do - createrepo --database $db -done - -# Stupid RHEL stuff -cd /tmp/zt-rpm-repo/el -ln -sf 6 6Client -ln -sf 6 6Workstation -ln -sf 6 6Server -ln -sf 6 6.0 -ln -sf 6 6.1 -ln -sf 6 6.2 -ln -sf 6 6.3 -ln -sf 6 6.4 -ln -sf 6 6.5 -ln -sf 6 6.6 -ln -sf 6 6.7 -ln -sf 6 6.8 -ln -sf 6 6.9 -ln -sf 7 7Client -ln -sf 7 7Workstation -ln -sf 7 7Server -ln -sf 7 7.0 -ln -sf 7 7.1 -ln -sf 7 7.2 -ln -sf 7 7.3 -ln -sf 7 7.4 -ln -sf 7 7.5 -ln -sf 7 7.6 -ln -sf 7 7.7 -ln -sf 7 7.8 -ln -sf 7 7.9 - -echo -echo Repo created in /tmp/zt-rpm-repo diff --git a/linux-build-farm/other/zerotier-containerized/Dockerfile b/linux-build-farm/other/zerotier-containerized/Dockerfile deleted file mode 100644 index 678216da..00000000 --- a/linux-build-farm/other/zerotier-containerized/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM alpine:latest -MAINTAINER Adam Ierymenko - -LABEL version="1.1.14" -LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts." - -# Uncomment to build in container -#RUN apk add --update alpine-sdk linux-headers - -RUN apk add --update libgcc libstdc++ - -ADD zerotier-one / -RUN chmod 0755 /zerotier-one -RUN ln -sf /zerotier-one /zerotier-cli -RUN mkdir -p /var/lib/zerotier-one - -ADD main.sh / -RUN chmod 0755 /main.sh - -ENTRYPOINT /main.sh diff --git a/linux-build-farm/other/zerotier-containerized/main.sh b/linux-build-farm/other/zerotier-containerized/main.sh deleted file mode 100755 index 685a6891..00000000 --- a/linux-build-farm/other/zerotier-containerized/main.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin - -if [ ! -e /dev/net/tun ]; then - echo 'FATAL: cannot start ZeroTier One in container: /dev/net/tun not present.' - exit 1 -fi - -exec /zerotier-one diff --git a/linux-build-farm/ubuntu-trusty/x64/Dockerfile b/linux-build-farm/ubuntu-trusty/x64/Dockerfile deleted file mode 100644 index f84cc6e3..00000000 --- a/linux-build-farm/ubuntu-trusty/x64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:14.04 -MAINTAINER Adam Ierymenko - -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 - -RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/ubuntu-trusty/x86/Dockerfile b/linux-build-farm/ubuntu-trusty/x86/Dockerfile deleted file mode 100644 index 6be3ae87..00000000 --- a/linux-build-farm/ubuntu-trusty/x86/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM 32bit/ubuntu:14.04 -MAINTAINER Adam Ierymenko - -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 - -RUN ln -sf /usr/bin/clang++-3.6 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.6 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/ubuntu-wily/x64/Dockerfile b/linux-build-farm/ubuntu-wily/x64/Dockerfile deleted file mode 100644 index 99b8d34c..00000000 --- a/linux-build-farm/ubuntu-wily/x64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:wily -MAINTAINER Adam Ierymenko - -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 - -RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/ubuntu-wily/x86/Dockerfile b/linux-build-farm/ubuntu-wily/x86/Dockerfile deleted file mode 100644 index 86ad14f2..00000000 --- a/linux-build-farm/ubuntu-wily/x86/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM daald/ubuntu32:wily -MAINTAINER Adam Ierymenko - -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 - -RUN ln -sf /usr/bin/clang++-3.7 /usr/bin/clang++ -RUN ln -sf /usr/bin/clang-3.7 /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/ubuntu-xenial/x64/Dockerfile b/linux-build-farm/ubuntu-xenial/x64/Dockerfile deleted file mode 100644 index fa665a0a..00000000 --- a/linux-build-farm/ubuntu-xenial/x64/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:xenial -MAINTAINER Adam Ierymenko - -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.8 - -#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ -#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang - -RUN rm -f /usr/bin/clang++ /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/linux-build-farm/ubuntu-xenial/x86/Dockerfile b/linux-build-farm/ubuntu-xenial/x86/Dockerfile deleted file mode 100644 index d01eec9b..00000000 --- a/linux-build-farm/ubuntu-xenial/x86/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM f69m/ubuntu32:xenial -MAINTAINER Adam Ierymenko - -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.8 - -#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ -#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang - -RUN rm -f /usr/bin/clang++ /usr/bin/clang - -RUN dpkg --purge libhttp-parser-dev - -ADD zt1-src.tar.gz / diff --git a/make-linux.mk b/make-linux.mk index ceb97a8a..ed8ec44b 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -113,7 +113,7 @@ endif #LDFLAGS= #STRIP=echo -all: one manpages +all: one one: $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o osdep/LinuxDropPrivileges.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(OBJS) service/OneService.o one.o osdep/LinuxEthernetTap.o osdep/LinuxDropPrivileges.o $(LDLIBS) @@ -131,13 +131,9 @@ manpages: FORCE 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 + 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 debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules distclean: clean - rm -rf doc/node_modules - find linux-build-farm -type f -name '*.deb' -print0 | xargs -0 rm -fv - find linux-build-farm -type f -name '*.rpm' -print0 | xargs -0 rm -fv - find linux-build-farm -type f -name 'zt1-src.tar.gz' | xargs rm -fv realclean: distclean -- cgit v1.2.3