summaryrefslogtreecommitdiff
path: root/linux-build-farm/centos-7/x86
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-27 15:46:54 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-06-27 15:46:54 -0700
commitd58dcf29cc4f580887e7bcadb354d5b71e826ee6 (patch)
tree8e095d6629c8498b56f89916d69cabb8abcdb450 /linux-build-farm/centos-7/x86
parent809457599afb2fcc6692ce4f4719b6fe172a3f9b (diff)
downloadinfinitytier-d58dcf29cc4f580887e7bcadb354d5b71e826ee6.tar.gz
infinitytier-d58dcf29cc4f580887e7bcadb354d5b71e826ee6.zip
For now go back to bundling http-parser etc. in our official RPM builds since this introduces an EPEL dependency for CentOS which would only make sense if we are actually in EPEL. Probably will eventually have two spec files: one for official and one for our own.
Diffstat (limited to 'linux-build-farm/centos-7/x86')
-rw-r--r--linux-build-farm/centos-7/x86/Dockerfile2
1 files changed, 2 insertions, 0 deletions
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 /