You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by dg...@apache.org on 2019/01/04 13:09:45 UTC
[trafficcontrol] branch 3.0.x updated: 3.0.x portal build (#3182)
This is an automated email from the ASF dual-hosted git repository.
dgelinas pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new 5a6e0ca 3.0.x portal build (#3182)
5a6e0ca is described below
commit 5a6e0caacb9e5712b1c7dd2f8d4249e8c4ba8b20
Author: Dan Kirkwood <da...@gmail.com>
AuthorDate: Fri Jan 4 06:09:40 2019 -0700
3.0.x portal build (#3182)
* Removed unnecessary http-parser dependency (#3126)
(cherry picked from commit a3be6308a812029ec064b0cc1dd287da0d2e32f0)
* lock TP dependency (#3132)
(cherry picked from commit 5c4a4c4dffe7d63185468f0c640f074ce9782b22)
* fix builder Dockerfiles (#3152)
(cherry picked from commit 9300ab2b3e608501b9a1d49463337a551ac3d553)
* fixes compass so the scss files can be compiled to css (#3162)
(cherry picked from commit 37f4de48834ff0deaecbe358bdf8f41b5009b9eb)
---
infrastructure/docker/build/Dockerfile-docs | 4 +++-
infrastructure/docker/build/Dockerfile-grove | 4 +++-
infrastructure/docker/build/Dockerfile-grovetccfg | 4 +++-
infrastructure/docker/build/Dockerfile-source | 4 +++-
infrastructure/docker/build/Dockerfile-traffic_monitor | 4 +++-
infrastructure/docker/build/Dockerfile-traffic_ops | 4 +++-
infrastructure/docker/build/Dockerfile-traffic_portal | 14 ++++++++------
infrastructure/docker/build/Dockerfile-traffic_router | 4 +++-
infrastructure/docker/build/Dockerfile-traffic_stats | 4 +++-
9 files changed, 32 insertions(+), 14 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 19e35f9..1380ca8 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 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 && \
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 72a5422..4f11866 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 && \