From 4c5b89fb6c40d980922e2788a0ffaee51a1427c6 Mon Sep 17 00:00:00 2001 From: asf-ci-trafficcontrol <127552316+asf-ci-trafficcontrol@users.noreply.github.com> Date: Wed, 3 Jul 2024 10:35:46 -0600 Subject: [PATCH] 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 Co-authored-by: Zach Hoffman (cherry picked from commit 0b21b43d34834cfbcd87af7a6226942774c059f6) --- .env | 2 +- GO_VERSION | 2 +- .../testing/docker/yumserver/Dockerfile | 4 +-- experimental/traffic-portal/package-lock.json | 13 +++---- .../testing/docker/db_init/Dockerfile | 14 +++++--- .../db/trafficvault/test/Dockerfile-db-admin | 34 +++++++++++++++---- .../test/docker/Dockerfile-db-admin | 19 ++++++----- 7 files changed, 58 insertions(+), 30 deletions(-) diff --git a/.env b/.env index eec0601e6b..a5100967d7 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ ATS_VERSION=9.2.4 -GO_VERSION=1.23.1 +GO_VERSION=1.22.5 POSTGRES_VERSION=13.16 diff --git a/GO_VERSION b/GO_VERSION index 49e0a31d49..da9594fd66 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.23.1 +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 dev@trafficcontrol.apache.org -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/experimental/traffic-portal/package-lock.json b/experimental/traffic-portal/package-lock.json index f2618aa430..7925fae7b6 100644 --- a/experimental/traffic-portal/package-lock.json +++ b/experimental/traffic-portal/package-lock.json @@ -55,7 +55,7 @@ "@types/node-forge": "^1.3.2", "@typescript-eslint/eslint-plugin": "^5.59.2", "@typescript-eslint/parser": "^5.59.2", - "axios": "^0.27.2", + "axios": "^0.28.0", "chromedriver": "^129.0.1", "codelyzer": "^6.0.0", "eslint": "^8.39.0", @@ -9056,13 +9056,14 @@ } }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz", + "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==", "dev": true, "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/axobject-query": { 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 f756e1677b..680a4a8a32 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 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 8ac88dd3a7..fa24860d67 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 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