summaryrefslogtreecommitdiff
path: root/linux-build-farm
diff options
context:
space:
mode:
Diffstat (limited to 'linux-build-farm')
-rw-r--r--linux-build-farm/centos-6/x64/Dockerfile6
-rw-r--r--linux-build-farm/centos-6/x86/Dockerfile5
-rw-r--r--linux-build-farm/centos-7/x64/Dockerfile5
-rw-r--r--linux-build-farm/centos-7/x86/Dockerfile2
4 files changed, 5 insertions, 13 deletions
diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile
index 3b6cd850..4080b88f 100644
--- a/linux-build-farm/centos-6/x64/Dockerfile
+++ b/linux-build-farm/centos-6/x64/Dockerfile
@@ -3,11 +3,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
-RUN yum install -y gcc-c++
-RUN yum install -y tar
-
+RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar
RUN yum install -y nodejs npm
ADD zt1-src.tar.gz /
diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile
index 37b83956..61aa4060 100644
--- a/linux-build-farm/centos-6/x86/Dockerfile
+++ b/linux-build-farm/centos-6/x86/Dockerfile
@@ -3,10 +3,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
-RUN yum install -y gcc-c++
-RUN yum install -y tar
+RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar
RUN yum install -y nodejs npm
diff --git a/linux-build-farm/centos-7/x64/Dockerfile b/linux-build-farm/centos-7/x64/Dockerfile
index a8e7335a..10b58402 100644
--- a/linux-build-farm/centos-7/x64/Dockerfile
+++ b/linux-build-farm/centos-7/x64/Dockerfile
@@ -3,11 +3,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 make development-tools rpmdevtools clang gcc-c++ ruby ruby-devel
-RUN yum install -y clang gcc-c++
-
-RUN yum install -y 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
index 99e077fd..c5ee8a69 100644
--- a/linux-build-farm/centos-7/x86/Dockerfile
+++ b/linux-build-farm/centos-7/x86/Dockerfile
@@ -17,4 +17,6 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
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 /