diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 14:21:54 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 14:21:54 -0700 |
| commit | 147f735333b3bbb88a5c8c5d832c8a18b9755952 (patch) | |
| tree | 177e489e7d8a8268cd0a3d514535ff67da981d03 /linux-build-farm | |
| parent | 8de5b2beda6d2e9102d3e77e179c0dc785b8e024 (diff) | |
| download | infinitytier-147f735333b3bbb88a5c8c5d832c8a18b9755952.tar.gz infinitytier-147f735333b3bbb88a5c8c5d832c8a18b9755952.zip | |
More build fixes.
Diffstat (limited to 'linux-build-farm')
| -rw-r--r-- | linux-build-farm/centos-6/x64/Dockerfile | 11 | ||||
| -rw-r--r-- | linux-build-farm/centos-6/x86/Dockerfile | 8 | ||||
| -rw-r--r-- | linux-build-farm/centos-7/x64/Dockerfile | 10 | ||||
| -rw-r--r-- | linux-build-farm/centos-7/x86/Dockerfile | 17 |
4 files changed, 38 insertions, 8 deletions
diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile index 8ae110aa..8599dc31 100644 --- a/linux-build-farm/centos-6/x64/Dockerfile +++ b/linux-build-farm/centos-6/x64/Dockerfile @@ -5,10 +5,13 @@ RUN yum update -y RUN yum install -y epel-release RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel -RUN yum install -y centos-release-scl -RUN yum install -y devtoolset-4-gcc-c++ +#RUN yum install -y centos-release-scl +#RUN yum install -y devtoolset-4-gcc-c++ -RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc -RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++ +RUN yum install -y clang +RUN yum install -y gcc-c++ + +#RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc +#RUN ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++ ADD zt1-src.tar.gz / diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile index 1e0da570..c46320c5 100644 --- a/linux-build-farm/centos-6/x86/Dockerfile +++ b/linux-build-farm/centos-6/x86/Dockerfile @@ -17,7 +17,7 @@ RUN yum install -y gcc-c++ ADD zt1-src.tar.gz / -RUN mv /ZeroTierOne/make-linux.mk /ZeroTierOne/make-linux.mk.old -RUN echo 'CFLAGS=-O3 -fstack-protector' >/ZeroTierOne/make-linux.mk -RUN echo 'CXXFLAGS=-O3 -fstack-protector' >>/ZeroTierOne/make-linux.mk -RUN cat /ZeroTierOne/make-linux.mk.old >>/ZeroTierOne/make-linux.mk +#RUN mv /ZeroTierOne/make-linux.mk /ZeroTierOne/make-linux.mk.old +#RUN echo 'CFLAGS=-O3 -fstack-protector' >/ZeroTierOne/make-linux.mk +#RUN echo 'CXXFLAGS=-O3 -fstack-protector' >>/ZeroTierOne/make-linux.mk +#RUN cat /ZeroTierOne/make-linux.mk.old >>/ZeroTierOne/make-linux.mk diff --git a/linux-build-farm/centos-7/x64/Dockerfile b/linux-build-farm/centos-7/x64/Dockerfile new file mode 100644 index 00000000..3b764d28 --- /dev/null +++ b/linux-build-farm/centos-7/x64/Dockerfile @@ -0,0 +1,10 @@ +FROM centos:7 +MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> + +RUN yum update -y +RUN yum install -y epel-release +RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-devel libnatpmp-devel + +RUN yum install -y clang gcc-c++ + +ADD zt1-src.tar.gz / diff --git a/linux-build-farm/centos-7/x86/Dockerfile b/linux-build-farm/centos-7/x86/Dockerfile new file mode 100644 index 00000000..fe0744bc --- /dev/null +++ b/linux-build-farm/centos-7/x86/Dockerfile @@ -0,0 +1,17 @@ +#FROM zerotier/centos7-32bit +#MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com> + +#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 <adam.ierymenko@zerotier.com> + +ADD zt1-src.tar.gz / |