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/05 19:06:54 UTC
[trafficcontrol] branch master updated: use golang package from
centos vault temporarily (#3088)
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 84ad1d7 use golang package from centos vault temporarily (#3088)
84ad1d7 is described below
commit 84ad1d730d9168293d625a17cc30121de9ef691f
Author: Dan Kirkwood <da...@gmail.com>
AuthorDate: Wed Dec 5 12:06:49 2018 -0700
use golang package from centos vault temporarily (#3088)
---
infrastructure/cdn-in-a-box/traffic_ops/Dockerfile | 26 ++++++++++++----------
.../docker/build/Dockerfile-traffic_monitor | 5 +++--
infrastructure/docker/build/Dockerfile-traffic_ops | 4 +++-
.../docker/build/Dockerfile-traffic_stats | 5 +++--
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 91b5ed0..e38add6 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -26,18 +26,20 @@ 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 && \
yum install -y \
- cpanminus \
- bind-utils \
- net-tools \
- gettext \
- nmap-ncat \
- openssl \
- perl \
- perl-Crypt-ScryptKDF \
- perl-Test-CPAN-Meta \
- perl-JSON-PP \
- git \
- golang
+ cpanminus \
+ bind-utils \
+ net-tools \
+ gettext \
+ nmap-ncat \
+ openssl \
+ perl \
+ perl-Crypt-ScryptKDF \
+ perl-Test-CPAN-Meta \
+ perl-JSON-PP \
+ git && \
+ 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/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 383f215..d636391 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -30,8 +30,9 @@ RUN yum -y install \
yum -y clean all
### traffic_monitor specific requirements
-RUN yum -y install \
- golang-1.9.4 && \
+# NOTE: temporary workaround for removal of golang packages from CentOS 7 base repo
+RUN 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
###
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 0e24d55..ac5cb72 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -30,15 +30,17 @@ RUN yum -y install \
yum -y clean all
### traffic_ops specific requirements
+# NOTE: temporary workaround for removal of golang packages from CentOS 7 base repo
RUN yum -y install \
expat-devel \
gcc \
- golang-1.9.4 \
libcurl-devel \
make \
openssl-devel \
perl-ExtUtils-MakeMaker \
tar && \
+ 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
ADD infrastructure/docker/build/clean_build.sh /
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index 89676b4..fe4e586 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -30,8 +30,9 @@ RUN yum -y install \
yum -y clean all
### traffic_stats specific requirements
-RUN yum -y install \
- golang-1.9.4 && \
+# NOTE: temporary workaround for removal of golang packages from CentOS 7 base repo
+RUN 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
###