This is an automated email from the ASF dual-hosted git repository.
rob 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 33d3f6b remove rpm path, load pg from repo (#3496)
33d3f6b is described below
commit 33d3f6b4d5836af877a55520a7e49f98f0ce35ee
Author: Dan Kirkwood <[email protected]>
AuthorDate: Thu Apr 18 09:39:59 2019 -0600
remove rpm path, load pg from repo (#3496)
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 15 +++++++++++----
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-db | 1 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 64ab4bf..ae6ce35 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -23,13 +23,22 @@
FROM centos:7
-RUN yum install -y epel-release && \
- yum install -y
https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-redhat96-9.6-3.noarch.rpm
&& \
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+ rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \
+ rpm --import
https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG && \
+ yum -y update ca-certificates && \
+ yum-config-manager --add-repo
https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64 && \
yum install -y \
+ epel-release \
+ pgdg-redhat-latest && \
+ yum -y clean all
+
+RUN yum install -y \
cpanminus \
bind-utils \
net-tools \
gettext \
+ golang \
nmap-ncat \
openssl \
perl \
@@ -39,8 +48,6 @@ RUN yum install -y epel-release && \
git \
iproute \
jq && \
- yum-config-manager --add-repo
'http://vault.centos.org/7.5.1804/os/x86_64/' && \
- yum -y install --enablerepo=vault* golang-1.9.4 && \
yum -y clean all
RUN yum install -y perl-DBIx-Connector
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-db
b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-db
index 42dbfef..11ec0f5 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-db
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile-db
@@ -25,4 +25,5 @@ ENV POSTGRES_PASSWORD=$POSTGRES_PASSWORD
RUN apk add bind-tools
COPY traffic_ops/initdb.d /docker-entrypoint-initdb.d
COPY traffic_ops/run-db.sh /
+RUN chmod -R a+rx /run-db.sh /docker-entrypoint-initdb.d
ENTRYPOINT /run-db.sh
