dewrich closed pull request #2473: require golang-1.9.4 using yum for all go
components
URL: https://github.com/apache/trafficcontrol/pull/2473
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/docker/build/Dockerfile-grove
b/infrastructure/docker/build/Dockerfile-grove
index 4c431f356..e03aa3a6f 100644
--- a/infrastructure/docker/build/Dockerfile-grove
+++ b/infrastructure/docker/build/Dockerfile-grove
@@ -33,7 +33,7 @@ RUN yum -y install \
### grove specific requirements
RUN yum -y install \
- golang && \
+ golang-1.9.4 && \
yum -y clean all
###
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor
b/infrastructure/docker/build/Dockerfile-traffic_monitor
index cdcaf10e8..383f2152d 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -31,7 +31,7 @@ RUN yum -y install \
### traffic_monitor specific requirements
RUN yum -y install \
- golang && \
+ 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 ca21a4c39..0e24d55fa 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -33,6 +33,7 @@ RUN yum -y install \
RUN yum -y install \
expat-devel \
gcc \
+ golang-1.9.4 \
libcurl-devel \
make \
openssl-devel \
@@ -40,9 +41,6 @@ RUN yum -y install \
tar && \
yum -y clean all
-ADD traffic_ops/install/bin/install_go.sh /
-RUN /install_go.sh
-
ADD infrastructure/docker/build/clean_build.sh /
CMD /clean_build.sh traffic_ops
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats
b/infrastructure/docker/build/Dockerfile-traffic_stats
index a0e6721f7..89676b49e 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -31,7 +31,7 @@ RUN yum -y install \
### traffic_stats specific requirements
RUN yum -y install \
- golang && \
+ golang-1.9.4 && \
yum -y clean all
###
diff --git a/traffic_ops/build/traffic_ops.spec
b/traffic_ops/build/traffic_ops.spec
index c5b353de3..1e2d265db 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -33,7 +33,7 @@ URL: https://github.com/apache/trafficcontrol/
Vendor: Apache Software Foundation
Packager: daniel_kirkwood at Cable dot Comcast dot com
AutoReqProv: no
-Requires: cpanminus, expat-devel, gcc-c++, libcurl, libpcap-devel,
mkisofs, tar
+Requires: cpanminus, expat-devel, gcc-c++, golang = 1.9.4, libcurl,
libpcap-devel, mkisofs, tar
Requires: openssl-devel, perl, perl-core, perl-DBD-Pg, perl-DBI,
perl-Digest-SHA1
Requires: libidn-devel, libcurl-devel, libcap
Requires: postgresql96 >= 9.6.2 , postgresql96-devel >= 9.6.2
@@ -56,7 +56,6 @@ Built: %(date) by %{getenv: USER}
# update version referenced in the source
perl -pi.bak -e 's/__VERSION__/%{version}-%{release}/' app/lib/UI/Utils.pm
- export PATH=$PATH:/usr/local/go/bin
export GOPATH=$(pwd)
echo "PATH: $PATH"
diff --git a/traffic_ops/install/bin/postinstall
b/traffic_ops/install/bin/postinstall
index d1eced8f1..95b114276 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -47,9 +47,6 @@ cd /opt/traffic_ops/app
export POSTGRES_HOME=${POSTGRES_HOME:-/usr/pgsql-9.6}
/usr/local/bin/carton
-# Install go
-/opt/traffic_ops/install/bin/install_go.sh
-
# Install go and goose
/opt/traffic_ops/install/bin/install_goose.sh
----------------------------------------------------------------
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
