summaryrefslogtreecommitdiff
path: root/linux-build-farm/centos-6/x86/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'linux-build-farm/centos-6/x86/Dockerfile')
-rw-r--r--linux-build-farm/centos-6/x86/Dockerfile14
1 files changed, 1 insertions, 13 deletions
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