Update Go version to 1.22.5 (apache#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]>
zrhoffman · Aug 15, 2024 · d2cddd3 · d2cddd3
1 parent eb890d4
commit d2cddd3
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 24 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
 ATS_VERSION=9.1.2
-GO_VERSION=1.22.1
+GO_VERSION=1.22.5
diff --git a/GO_VERSION b/GO_VERSION
@@ -1 +1 @@
-1.22.1
+1.22.5
diff --git 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
@@ -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
@@ -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
@@ -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