You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/12/20 16:07:18 UTC

[trafficcontrol] branch master updated: fix builder Dockerfiles (#3152)

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 9300ab2  fix builder Dockerfiles (#3152)
9300ab2 is described below

commit 9300ab2b3e608501b9a1d49463337a551ac3d553
Author: Dan Kirkwood <da...@gmail.com>
AuthorDate: Thu Dec 20 09:07:12 2018 -0700

    fix builder Dockerfiles (#3152)
---
 infrastructure/docker/build/Dockerfile-docs        |  4 +++-
 infrastructure/docker/build/Dockerfile-grove       |  4 +++-
 infrastructure/docker/build/Dockerfile-grovetccfg  |  4 +++-
 infrastructure/docker/build/Dockerfile-source      |  4 +++-
 .../docker/build/Dockerfile-traffic_monitor        |  4 +++-
 infrastructure/docker/build/Dockerfile-traffic_ops |  4 +++-
 .../docker/build/Dockerfile-traffic_portal         | 24 +++++++++++++++-------
 .../docker/build/Dockerfile-traffic_router         |  4 +++-
 .../docker/build/Dockerfile-traffic_stats          |  4 +++-
 9 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/infrastructure/docker/build/Dockerfile-docs b/infrastructure/docker/build/Dockerfile-docs
index 58f818f..0728f43 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 818a655..e296261 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 3ff98ed..8372146 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 5eb2c89..6891509 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 d636391..1e92265 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 ac5cb72..8c84e17 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 e37c619..8d8d9b9 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 dev@trafficcontrol.apache.org
 
 # 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 3b168e6..d4840f7 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 fe4e586..c2c87ed 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 && \