diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 15:46:54 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-06-27 15:46:54 -0700 |
| commit | d58dcf29cc4f580887e7bcadb354d5b71e826ee6 (patch) | |
| tree | 8e095d6629c8498b56f89916d69cabb8abcdb450 /linux-build-farm | |
| parent | 809457599afb2fcc6692ce4f4719b6fe172a3f9b (diff) | |
| download | infinitytier-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')
| -rw-r--r-- | linux-build-farm/centos-6/x64/Dockerfile | 6 | ||||
| -rw-r--r-- | linux-build-farm/centos-6/x86/Dockerfile | 5 | ||||
| -rw-r--r-- | linux-build-farm/centos-7/x64/Dockerfile | 5 | ||||
| -rw-r--r-- | linux-build-farm/centos-7/x86/Dockerfile | 2 |
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 / |