diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 14:36:58 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 14:36:58 -0700 |
| commit | 233945e60fd2d4779d19536b4330025e350b3ed4 (patch) | |
| tree | 9bbb8ac13adf1626578daaceaaaf4b971dc20a14 /linux-build-farm | |
| parent | 147f735333b3bbb88a5c8c5d832c8a18b9755952 (diff) | |
| download | infinitytier-233945e60fd2d4779d19536b4330025e350b3ed4.tar.gz infinitytier-233945e60fd2d4779d19536b4330025e350b3ed4.zip | |
More Dockerfile fixes, and do not use "ln -r" since it is not supported on older Linux distributions.
Diffstat (limited to 'linux-build-farm')
| -rw-r--r-- | linux-build-farm/centos-6/x64/Dockerfile | 8 | ||||
| -rw-r--r-- | linux-build-farm/centos-6/x86/Dockerfile | 14 |
2 files changed, 2 insertions, 20 deletions
diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile index 8599dc31..c7b0063f 100644 --- a/linux-build-farm/centos-6/x64/Dockerfile +++ b/linux-build-farm/centos-6/x64/Dockerfile @@ -4,14 +4,8 @@ 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 centos-release-scl -#RUN yum install -y devtoolset-4-gcc-c++ - 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++ +RUN yum install -y tar ADD zt1-src.tar.gz / diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile index c46320c5..f1a58488 100644 --- a/linux-build-farm/centos-6/x86/Dockerfile +++ b/linux-build-farm/centos-6/x86/Dockerfile @@ -4,20 +4,8 @@ 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 rpm --import http://ftp.scientificlinux.org/linux/scientific/5x/x86_64/RPM-GPG-KEYs/RPM-GPG-KEY-cern -#RUN curl http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo >/etc/yum.repos.d/slc6-devtoolset.repo -#RUN yum install -y devtoolset-2-gcc-c++ - -#RUN ln -sf /opt/rh/devtoolset-2/root/usr/bin/gcc /usr/bin/gcc -#RUN ln -sf /opt/rh/devtoolset-2/root/usr/bin/g++ /usr/bin/g++ - RUN yum install -y clang RUN yum install -y gcc-c++ +RUN yum install -y tar 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 |