mitchell852 closed pull request #3152: fix builder Dockerfiles
URL: https://github.com/apache/trafficcontrol/pull/3152
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/infrastructure/docker/build/Dockerfile-docs
b/infrastructure/docker/build/Dockerfile-docs
index 58f818fff..0728f430c 100644
--- a/infrastructure/docker/build/Dockerfile-docs
+++ b/infrastructure/docker/build/Dockerfile-docs
@@ -23,7 +23,9 @@ MAINTAINER Jonathan Gray
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release \
git \
rpm-build && \
diff --git a/infrastructure/docker/build/Dockerfile-grove
b/infrastructure/docker/build/Dockerfile-grove
index 818a6552e..e29626107 100644
--- a/infrastructure/docker/build/Dockerfile-grove
+++ b/infrastructure/docker/build/Dockerfile-grove
@@ -23,7 +23,9 @@ MAINTAINER Chris Lemmons
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release && \
yum -y clean all
RUN yum -y install \
diff --git a/infrastructure/docker/build/Dockerfile-grovetccfg
b/infrastructure/docker/build/Dockerfile-grovetccfg
index 3ff98ed3e..837214642 100644
--- a/infrastructure/docker/build/Dockerfile-grovetccfg
+++ b/infrastructure/docker/build/Dockerfile-grovetccfg
@@ -23,7 +23,9 @@ MAINTAINER John Rushford
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN yum -y update ca-certificates &&\
+ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y install \
epel-release && \
yum -y clean all
RUN yum -y install \
diff --git a/infrastructure/docker/build/Dockerfile-source
b/infrastructure/docker/build/Dockerfile-source
index 5eb2c89f7..68915096e 100644
--- a/infrastructure/docker/build/Dockerfile-source
+++ b/infrastructure/docker/build/Dockerfile-source
@@ -23,7 +23,9 @@ MAINTAINER Dan Kirkwood
# docker run --volume /trafficcontrol:$(pwd) ...
VOLUME /trafficcontrol
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
git && \
yum -y clean all
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor
b/infrastructure/docker/build/Dockerfile-traffic_monitor
index d63639162..1e92265c2 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -23,7 +23,9 @@ MAINTAINER Dan Kirkwood
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release \
git \
rpm-build && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops
b/infrastructure/docker/build/Dockerfile-traffic_ops
index ac5cb7251..8c84e176b 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -23,7 +23,9 @@ MAINTAINER Dan Kirkwood
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release \
git \
rpm-build && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal
b/infrastructure/docker/build/Dockerfile-traffic_portal
index e37c61982..8d8d9b978 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -16,14 +16,16 @@
# under the License.
FROM centos:7
-MAINTAINER Dan Kirkwood
+MAINTAINER [email protected]
# top level of trafficcontrol directory must be mounted as a volume:
# docker run --volume /trafficcontrol:$(pwd) ...
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release \
git \
rpm-build && \
@@ -35,12 +37,20 @@ RUN yum -y install \
libffi-devel \
make \
nodejs \
- npm \
- ruby-devel \
- rubygems
+ npm
+
+# NOTE: error installing with default ruby 2.0.0. This allows us to upgrade
to 2.3
+RUN yum -y install \
+ centos-release-scl \
+ openssl-devel && \
+ yum -y install \
+ rh-ruby23 \
+ rh-ruby23-ruby-devel \
+ rh-ruby23-runygems
-RUN gem update --system && \
- gem install rb-inotify -v 0.9.10 && \
+RUN . /opt/rh/rh-ruby23/enable && \
+ gem update --system --no-document && \
+ gem install rb-inotify && \
gem install compass && \
npm -g install bower grunt-cli
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router
b/infrastructure/docker/build/Dockerfile-traffic_router
index 3b168e6fb..d4840f747 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -23,7 +23,9 @@ MAINTAINER Dan Kirkwood
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release \
git \
rpm-build && \
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats
b/infrastructure/docker/build/Dockerfile-traffic_stats
index fe4e5863e..c2c87ed6e 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -23,7 +23,9 @@ MAINTAINER Dan Kirkwood
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y install \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ yum -y update ca-certificates && \
+ yum -y install \
epel-release \
git \
rpm-build && \
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
