More Dockerfile fixes, and do not use "ln -r" since it is not supported on older Linux distributions.

linux-build-farm/centos-6/x64/Dockerfile

@@ -4,14 +4,8 @@ MAINTAINER Adam Ierymenko <[email protected]>
 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 /

linux-build-farm/centos-6/x86/Dockerfile

@@ -4,20 +4,8 @@ MAINTAINER Adam Ierymenko <[email protected]>
 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

make-linux.mk

@@ -164,15 +164,15 @@ install:	FORCE
 	mkdir -p $(DESTDIR)/usr/bin
 	rm -f $(DESTDIR)/usr/bin/zerotier-cli
 	rm -f $(DESTDIR)/usr/bin/zerotier-idtool
-	ln -rs $(DESTDIR)/usr/sbin/zerotier-one $(DESTDIR)/usr/bin/zerotier-cli
-	ln -rs $(DESTDIR)/usr/sbin/zerotier-one $(DESTDIR)/usr/bin/zerotier-idtool
+	ln -s ../sbin/zerotier-one $(DESTDIR)/usr/bin/zerotier-cli
+	ln -s ../sbin/zerotier-one $(DESTDIR)/usr/bin/zerotier-idtool
 	mkdir -p $(DESTDIR)/var/lib/zerotier-one
 	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-one
 	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
 	rm -f $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
-	ln -rs $(DESTDIR)/usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-one
-	ln -rs $(DESTDIR)/usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
-	ln -rs $(DESTDIR)/usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
+	ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-one
+	ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-cli
+	ln -s ../../../usr/sbin/zerotier-one $(DESTDIR)/var/lib/zerotier-one/zerotier-idtool
 	mkdir -p $(DESTDIR)/usr/share/man/man8
 	rm -f $(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz
 	cat doc/zerotier-one.8 | gzip -9 >$(DESTDIR)/usr/share/man/man8/zerotier-one.8.gz