Adam Ierymenko 9 년 전
부모
커밋
4d30f60bbe
3개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 0
      linux-build-farm/centos-6/x64/Dockerfile
  2. 3 0
      linux-build-farm/centos-6/x86/Dockerfile
  3. 1 1
      linux-build-farm/centos-7/x86/Dockerfile

+ 4 - 0
linux-build-farm/centos-6/x64/Dockerfile

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

+ 3 - 0
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 /

+ 1 - 1
linux-build-farm/centos-7/x86/Dockerfile

@@ -17,6 +17,6 @@ MAINTAINER Adam Ierymenko <[email protected]>
 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 /