summaryrefslogtreecommitdiff
path: root/linux-build-farm
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-27 16:12:17 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-27 16:12:17 -0700
commit4d30f60bbea724028932b1ec1a7e8e9e9e08b3c7 (patch)
tree099584b134eff0b415a4c47e35fbb6431acc62d9 /linux-build-farm
parentd58dcf29cc4f580887e7bcadb354d5b71e826ee6 (diff)
downloadinfinitytier-4d30f60bbea724028932b1ec1a7e8e9e9e08b3c7.tar.gz
infinitytier-4d30f60bbea724028932b1ec1a7e8e9e9e08b3c7.zip
.
Diffstat (limited to 'linux-build-farm')
-rw-r--r--linux-build-farm/centos-6/x64/Dockerfile4
-rw-r--r--linux-build-farm/centos-6/x86/Dockerfile3
-rw-r--r--linux-build-farm/centos-7/x86/Dockerfile2
3 files changed, 8 insertions, 1 deletions
diff --git a/linux-build-farm/centos-6/x64/Dockerfile b/linux-build-farm/centos-6/x64/Dockerfile
index 4080b88f..2796e422 100644
--- a/linux-build-farm/centos-6/x64/Dockerfile
+++ b/linux-build-farm/centos-6/x64/Dockerfile
@@ -4,6 +4,10 @@ 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 clang gcc-c++ tar
+
RUN yum install -y nodejs npm
+# Stop use of http-parser-devel which is installed by nodejs/npm
+RUN rm -f /usr/include/http_parser.h
+
ADD zt1-src.tar.gz /
diff --git a/linux-build-farm/centos-6/x86/Dockerfile b/linux-build-farm/centos-6/x86/Dockerfile
index 61aa4060..8192d139 100644
--- a/linux-build-farm/centos-6/x86/Dockerfile
+++ b/linux-build-farm/centos-6/x86/Dockerfile
@@ -7,4 +7,7 @@ RUN yum install -y make development-tools rpmdevtools clang gcc-c++ tar
RUN yum install -y nodejs npm
+# Stop use of http-parser-devel which is installed by nodejs/npm
+RUN rm -f /usr/include/http_parser.h
+
ADD zt1-src.tar.gz /
diff --git a/linux-build-farm/centos-7/x86/Dockerfile b/linux-build-farm/centos-7/x86/Dockerfile
index c5ee8a69..a637a8d3 100644
--- a/linux-build-farm/centos-7/x86/Dockerfile
+++ b/linux-build-farm/centos-7/x86/Dockerfile
@@ -17,6 +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
+#RUN rpm --erase http-parser-devel lz4-devel libnatpmp-devel
ADD zt1-src.tar.gz /