dg4prez closed pull request #3182: 3.0.x portal build
URL: https://github.com/apache/trafficcontrol/pull/3182
 
 
   

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 19e35f9bf..1380ca8a8 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -16,22 +16,23 @@
 # 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 && \
        yum -y clean all
 
 # traffic_portal specific
-RUN    rpm -ivh 
https://kojipkgs.fedoraproject.org//packages/http-parser/2.7.1/3.el7/x86_64/http-parser-2.7.1-3.el7.x86_64.rpm
 && \
-       yum -y install \
+RUN    yum -y install \
                gcc \
                libffi-devel \
                make \
@@ -40,8 +41,9 @@ RUN   rpm -ivh 
https://kojipkgs.fedoraproject.org//packages/http-parser/2.7.1/3.el
                ruby-devel \
                rubygems
 
-RUN    gem install compass
-RUN    npm -g install bower grunt-cli
+RUN    gem install rb-inotify -v 0.9.10 && \
+       gem install compass && \
+       npm -g install bower grunt-cli
 
 # bower will not run as root by default
 RUN    echo '{ "allow_root": true }' > /root/.bowerrc
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router 
b/infrastructure/docker/build/Dockerfile-traffic_router
index 72a5422ef..4f11866ba 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

Reply via email to