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 07363c3 upgrade go in all components; better consistency in
Dockerfiles (#3463)
07363c3 is described below
commit 07363c38dd20fe0417594c82c2c80ac77b486359
Author: Dan Kirkwood <[email protected]>
AuthorDate: Mon Apr 8 13:17:39 2019 -0600
upgrade go in all components; better consistency in Dockerfiles (#3463)
---
CHANGELOG.md | 1 +
infrastructure/docker/build/Dockerfile-docs | 5 ++---
infrastructure/docker/build/Dockerfile-grove | 7 ++++---
infrastructure/docker/build/Dockerfile-grovetccfg | 11 ++++++-----
infrastructure/docker/build/Dockerfile-source | 7 +++++++
infrastructure/docker/build/Dockerfile-traffic_monitor | 13 +++++++------
infrastructure/docker/build/Dockerfile-traffic_ops | 13 +++++++------
infrastructure/docker/build/Dockerfile-traffic_portal | 8 ++++----
infrastructure/docker/build/Dockerfile-traffic_router | 10 +++++-----
infrastructure/docker/build/Dockerfile-traffic_stats | 14 +++++++-------
traffic_ops/build/traffic_ops.spec | 2 +-
11 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df5424c..7e732d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Traffic Monitor UI updated to support HTTP or HTTPS traffic.
- Modified Traffic Router logging format to include an additional field for
DNS log entries, namely `rhi`. This defaults to '-' and is only used when EDNS0
client subnet extensions are enabled and a client subnet is present in the
request. When enabled and a subnet is present, the subnet appears in the `chi`
field and the resolver address is in the `rhi` field.
- Changed traffic_ops_ort.pl so that hdr_rw-<ds>.config files are compared
with strict ordering and line duplication when detecting configuration changes.
+- Traffic Ops (golang), Traffic Monitor, Traffic Stats are now compiled using
Go version 1.11. Grove was already being compiled with this version which
improves performance for TLS when RSA certificates are used.
## [3.0.0] - 2018-10-30
### Added
diff --git a/infrastructure/docker/build/Dockerfile-docs
b/infrastructure/docker/build/Dockerfile-docs
index 6b5b97f..888cf0c 100644
--- a/infrastructure/docker/build/Dockerfile-docs
+++ b/infrastructure/docker/build/Dockerfile-docs
@@ -24,11 +24,10 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
- epel-release \
- git \
- rpm-build && \
+ epel-release && \
yum -y clean all
### docs specific requirements
diff --git a/infrastructure/docker/build/Dockerfile-grove
b/infrastructure/docker/build/Dockerfile-grove
index f9f5811..10804ee 100644
--- a/infrastructure/docker/build/Dockerfile-grove
+++ b/infrastructure/docker/build/Dockerfile-grove
@@ -24,18 +24,19 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
epel-release && \
yum -y clean all
+
+### grove specific requirements
RUN yum -y install \
git \
+ golang \
rpm-build && \
yum -y clean all
-### grove specific requirements
-RUN curl https://dl.google.com/go/go1.11.linux-amd64.tar.gz -o
/tmp/go1.11.linux-amd64.tar.gz && \
- tar xzvf /tmp/go1.11.linux-amd64.tar.gz -C /usr/local
###
ADD infrastructure/docker/build/clean_build.sh /
diff --git a/infrastructure/docker/build/Dockerfile-grovetccfg
b/infrastructure/docker/build/Dockerfile-grovetccfg
index 6a92abe..d3c0b1d 100644
--- a/infrastructure/docker/build/Dockerfile-grovetccfg
+++ b/infrastructure/docker/build/Dockerfile-grovetccfg
@@ -23,19 +23,20 @@ MAINTAINER [email protected]
VOLUME /trafficcontrol
### Common for all sub-component builds
-RUN yum -y update ca-certificates &&\
- rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+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 &&
\
+ yum -y update ca-certificates && \
yum -y install \
epel-release && \
yum -y clean all
+
+### grovetccfg specific requirements
RUN yum -y install \
git \
+ golang \
rpm-build && \
yum -y clean all
-### grovetccfg specific requirements
-RUN curl https://dl.google.com/go/go1.11.linux-amd64.tar.gz -o
/tmp/go1.11.linux-amd64.tar.gz && \
- tar xzvf /tmp/go1.11.linux-amd64.tar.gz -C /usr/local
###
ADD infrastructure/docker/build/clean_build.sh /
diff --git a/infrastructure/docker/build/Dockerfile-source
b/infrastructure/docker/build/Dockerfile-source
index db58c45..7c0322f 100644
--- a/infrastructure/docker/build/Dockerfile-source
+++ b/infrastructure/docker/build/Dockerfile-source
@@ -23,9 +23,16 @@ MAINTAINER [email protected]
# docker run --volume /trafficcontrol:$(pwd) ...
VOLUME /trafficcontrol
+### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
+ epel-release && \
+ yum -y clean all
+
+### source specific requirements
+RUN 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 f11f8d1..6b5e052 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -24,18 +24,19 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
- epel-release \
- git \
- rpm-build && \
+ epel-release && \
yum -y clean all
### traffic_monitor specific requirements
-# 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 && \
+RUN yum -y install \
+ git \
+ golang \
+ rpm-build && \
yum -y clean all
+
###
ADD infrastructure/docker/build/clean_build.sh /
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops
b/infrastructure/docker/build/Dockerfile-traffic_ops
index bc9de9b..30e7146 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -24,27 +24,28 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
- epel-release \
- git \
- rpm-build && \
+ epel-release && \
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 \
+ git \
+ golang \
libcurl-devel \
make \
openssl-devel \
perl-ExtUtils-MakeMaker \
+ rpm-build \
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 /
CMD /clean_build.sh traffic_ops
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal
b/infrastructure/docker/build/Dockerfile-traffic_portal
index 1380ca8..6b3bc3b 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -24,20 +24,21 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
- epel-release \
- git \
- rpm-build && \
+ epel-release && \
yum -y clean all
# traffic_portal specific
RUN yum -y install \
gcc \
+ git \
libffi-devel \
make \
nodejs \
npm \
+ rpm-build \
ruby-devel \
rubygems
@@ -53,5 +54,4 @@ RUN echo '{ "allow_root": true }' > /root/.bowerrc
ADD infrastructure/docker/build/clean_build.sh /
CMD /clean_build.sh traffic_portal
-
# vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router
b/infrastructure/docker/build/Dockerfile-traffic_router
index 6a881fa..56c1192 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -24,19 +24,20 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
- epel-release \
- git \
- rpm-build && \
+ epel-release && \
yum -y clean all
### traffic_router specific requirements
RUN yum -y install \
which \
curl \
+ git \
java-1.8.0-openjdk \
- java-1.8.0-openjdk-devel && \
+ java-1.8.0-openjdk-devel \
+ rpm-build && \
yum -y clean all
ENV JAVA_HOME=/usr/lib/jvm/java
@@ -49,5 +50,4 @@ RUN curl -L
https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3
ADD infrastructure/docker/build/clean_build.sh /
CMD /clean_build.sh traffic_router
-
# vi:syntax=Dockerfile
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats
b/infrastructure/docker/build/Dockerfile-traffic_stats
index 9c162ca..c6db846 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -24,22 +24,22 @@ VOLUME /trafficcontrol
### Common for all sub-component builds
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 &&
\
yum -y update ca-certificates && \
yum -y install \
- epel-release \
- git \
- rpm-build && \
+ epel-release && \
yum -y clean all
### traffic_stats specific requirements
-# 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 && \
+RUN yum -y install \
+ git \
+ golang \
+ rpm-build && \
yum -y clean all
+
###
ADD infrastructure/docker/build/clean_build.sh /
CMD /clean_build.sh traffic_stats
-
# vi:syntax=Dockerfile
diff --git a/traffic_ops/build/traffic_ops.spec
b/traffic_ops/build/traffic_ops.spec
index bcd8990..e841ba5 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++, golang >= 1.9.4, libcurl,
libpcap-devel, mkisofs, tar
+Requires: cpanminus, expat-devel, gcc-c++, golang >= 1.11, 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
