This is an automated email from the ASF dual-hosted git repository.
zrhoffman 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 0b21b43d34 Update Go version to 1.22.5 (#8034)
0b21b43d34 is described below
commit 0b21b43d34834cfbcd87af7a6226942774c059f6
Author: asf-ci-trafficcontrol
<[email protected]>
AuthorDate: Wed Jul 3 12:35:46 2024 -0400
Update Go version to 1.22.5 (#8034)
* Update Go version to 1.22.5
* Update some images to Rocky Linux 8
---------
Co-authored-by: asf-ci-trafficcontrol
<[email protected]>
Co-authored-by: Zach Hoffman <[email protected]>
---
.env | 2 +-
GO_VERSION | 2 +-
cache-config/testing/docker/yumserver/Dockerfile | 4 +--
tc-health-client/testing/docker/db_init/Dockerfile | 14 +++++----
.../app/db/trafficvault/test/Dockerfile-db-admin | 34 ++++++++++++++++++----
traffic_ops_db/test/docker/Dockerfile-db-admin | 19 ++++++------
6 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/.env b/.env
index c55443e88b..2f8c858f5a 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
ATS_VERSION=9.1.2
-GO_VERSION=1.22.4
+GO_VERSION=1.22.5
diff --git a/GO_VERSION b/GO_VERSION
index 2a0ba77cc5..da9594fd66 100644
--- a/GO_VERSION
+++ b/GO_VERSION
@@ -1 +1 @@
-1.22.4
+1.22.5
diff --git a/cache-config/testing/docker/yumserver/Dockerfile
b/cache-config/testing/docker/yumserver/Dockerfile
index 254b515c92..416f0e4d46 100644
--- a/cache-config/testing/docker/yumserver/Dockerfile
+++ b/cache-config/testing/docker/yumserver/Dockerfile
@@ -20,10 +20,10 @@
# Based on CentOS 6.6
############################################################
-FROM centos:7
+FROM rockylinux:8
MAINTAINER [email protected]
-RUN yum install -y httpd createrepo yum-utils
+RUN dnf install -y httpd createrepo yum-utils
RUN mkdir -p /var/www/html/traffic-control/7/x86_64/Packages
RUN sed -i -e 's/#ServerName www.example.com:80/ServerName
www.example.com:80/g' /etc/httpd/conf/httpd.conf
diff --git a/tc-health-client/testing/docker/db_init/Dockerfile
b/tc-health-client/testing/docker/db_init/Dockerfile
index e101c4f9dd..d4336a4a09 100644
--- a/tc-health-client/testing/docker/db_init/Dockerfile
+++ b/tc-health-client/testing/docker/db_init/Dockerfile
@@ -20,15 +20,19 @@
# Based on CentOS 7.2
############################################################
-FROM centos/systemd
+FROM rockylinux:8
-RUN yum install -y
https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+RUN dnf install -y \
+ epel-release \
+ libicu \
+ "https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-$(rpm
--eval %_arch)/pgdg-redhat-repo-latest.noarch.rpm" && \
+ dnf -y --repo=pgdg13 install postgresql13 && \
+ dnf -y remove pgdg-redhat-repo
-RUN yum -y install \
- postgresql13 \
+RUN dnf -y install \
nmap-ncat \
cpanminus && \
- yum clean all
+ dnf clean all
ENV POSTGRES_HOME $POSTGRES_HOME
ENV PGPASSWORD $PGPASSWORD
diff --git a/traffic_ops/app/db/trafficvault/test/Dockerfile-db-admin
b/traffic_ops/app/db/trafficvault/test/Dockerfile-db-admin
index 0ac328a2da..e039037cf0 100644
--- a/traffic_ops/app/db/trafficvault/test/Dockerfile-db-admin
+++ b/traffic_ops/app/db/trafficvault/test/Dockerfile-db-admin
@@ -19,17 +19,39 @@
# Dockerfile to build Traffic Ops DB admin test environment
############################################################
-FROM centos:7
+FROM rockylinux:8
ARG POSTGRES_VERSION=13.2
ENV POSTGRES_VERSION=$POSTGRES_VERSION
# NOTE: temporary workaround for removal of golang packages from CentOS 7 base
repo
RUN yum install -y \
- epel-release \
- centos-release-scl-rh \
-
https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
\
- git && \
- yum -y install golang
+ epel-release \
+ libicu \
+ "https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-$(rpm
--eval %_arch)/pgdg-redhat-repo-latest.noarch.rpm" \
+ git && \
+ dnf -y --repo=pgdg13 install postgresql13 && \
+ dnf -y remove pgdg-redhat-repo && \
+ dnf -y --enablerepo=powertools install \
+ cpanminus \
+ expat-devel \
+ golang \
+ libcap \
+ libcurl-devel \
+ libidn-devel \
+ libpcap-devel \
+ mkisofs \
+ openssl-devel \
+ perl-core \
+ perl-Crypt-ScryptKDF \
+ perl-DBD-Pg \
+ perl-DBI \
+ perl-Digest-SHA1 \
+ perl-JSON \
+ perl-libwww-perl \
+ perl-TermReadKey \
+ perl-Test-CPAN-Meta \
+ perl-WWW-Curl \
+ python3
# Override TRAFFIC_OPS_RPM arg to use a different one using --build-arg
TRAFFIC_OPS_RPM=... Can be local file or http://...
ARG TRAFFIC_OPS_RPM=traffic_ops.rpm
diff --git a/traffic_ops_db/test/docker/Dockerfile-db-admin
b/traffic_ops_db/test/docker/Dockerfile-db-admin
index 03745c9dc7..b2add5929a 100644
--- a/traffic_ops_db/test/docker/Dockerfile-db-admin
+++ b/traffic_ops_db/test/docker/Dockerfile-db-admin
@@ -19,16 +19,18 @@
# Dockerfile to build Traffic Ops DB admin test environment
############################################################
-FROM centos:7
+FROM rockylinux:8
ARG POSTGRES_VERSION=13.2
ENV POSTGRES_VERSION=$POSTGRES_VERSION
-RUN yum install -y \
- epel-release \
- centos-release-scl-rh \
-
https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
\
+RUN dnf install -y \
+ epel-release \
+ libicu \
+ "https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-$(rpm
--eval %_arch)/pgdg-redhat-repo-latest.noarch.rpm" \
git && \
- yum -y install \
+ dnf -y --repo=pgdg13 install postgresql13 && \
+ dnf -y remove pgdg-redhat-repo && \
+ dnf -y --enablerepo=powertools install \
cpanminus \
expat-devel \
libcap \
@@ -47,9 +49,8 @@ RUN yum install -y \
perl-TermReadKey \
perl-Test-CPAN-Meta \
perl-WWW-Curl \
- postgresql13 \
- postgresql13-devel &&\
- yum clean all
+ python3 && \
+ dnf clean all
# Override TRAFFIC_OPS_RPM arg to use a different one using --build-arg
TRAFFIC_OPS_RPM=... Can be local file or http://...
ARG TRAFFIC_OPS_RPM=traffic_ops.rpm
