dg4prez closed pull request #3089: 3.0.x: use golang package from centos
vault temporarily
URL: https://github.com/apache/trafficcontrol/pull/3089
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/cdn-in-a-box/traffic_ops/Dockerfile
b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index 471fcc3ef..f3049487c 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 cpanm Carton
RUN yum install -y perl-DBIx-Connector
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor
b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 383f2152d..d63639162 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 0e24d55fa..ac5cb7251 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 89676b49e..fe4e5863e 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
###
----------------------------------------------------------------
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
