From 8219f09fb128168f85915628005cecdd5a564376 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Mon, 22 Jul 2024 20:16:49 +0200 Subject: [PATCH] fix ciab-build (#125) * fix ciab-build * fix yumserver Dockerfile * 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 --------- Co-authored-by: asf-ci-trafficcontrol Co-authored-by: Zach Hoffman --- .env | 2 +- GO_VERSION | 2 +- .../testing/docker/trafficserver/Dockerfile | 3 +- .../testing/docker/trafficserver/run.sh | 1 + .../docker/trafficserver/trafficserver.env | 21 ++++++++++++ .../docker/trafficserver/trafficserver.spec | 5 +++ .../testing/docker/yumserver/Dockerfile | 4 +-- .../testing/docker/db_init/Dockerfile | 14 +++++--- .../db/trafficvault/test/Dockerfile-db-admin | 34 +++++++++++++++---- .../test/docker/Dockerfile-db-admin | 19 ++++++----- 10 files changed, 80 insertions(+), 25 deletions(-) create mode 100644 cache-config/testing/docker/trafficserver/trafficserver.env diff --git a/.env b/.env index f7218a9923..2f8c858f5a 100644 --- 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 index 6245beecd3..da9594fd66 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.22.1 +1.22.5 diff --git a/cache-config/testing/docker/trafficserver/Dockerfile b/cache-config/testing/docker/trafficserver/Dockerfile index 731a349f7a..eb3f3f0938 100644 --- a/cache-config/testing/docker/trafficserver/Dockerfile +++ b/cache-config/testing/docker/trafficserver/Dockerfile @@ -116,6 +116,7 @@ COPY cache-config/testing/docker/trafficserver/traffic_server_jemalloc \ cache-config/testing/docker/trafficserver/cjose.pic.patch \ cache-config/testing/docker/trafficserver/jansson.pic.patch \ cache-config/testing/docker/trafficserver/run.sh \ - / + cache-config/testing/docker/trafficserver/trafficserver.env \ + / CMD /run.sh diff --git a/cache-config/testing/docker/trafficserver/run.sh b/cache-config/testing/docker/trafficserver/run.sh index 1e51741740..eb115f8cc6 100755 --- a/cache-config/testing/docker/trafficserver/run.sh +++ b/cache-config/testing/docker/trafficserver/run.sh @@ -93,6 +93,7 @@ cd /root/rpmbuild/SOURCES # clone the trafficserver repo git clone https://github.com/apache/trafficserver.git --branch $ATS_VERSION || die "Failed to fetch the ATS Source" cp /traffic_server_jemalloc . +cp /trafficserver.env . # patch in the astats plugin (cp -fa /astats_over_http /root/rpmbuild/SOURCES/trafficserver/plugins/astats_over_http diff --git a/cache-config/testing/docker/trafficserver/trafficserver.env b/cache-config/testing/docker/trafficserver/trafficserver.env new file mode 100644 index 0000000000..c576ffc107 --- /dev/null +++ b/cache-config/testing/docker/trafficserver/trafficserver.env @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +STDOUTLOG=/var/log/trafficserver/traffic.out +STDERRLOG=/var/log/trafficserver/traffic.out \ No newline at end of file diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec index fd4213a6d2..aa7c04b48b 100644 --- a/cache-config/testing/docker/trafficserver/trafficserver.spec +++ b/cache-config/testing/docker/trafficserver/trafficserver.spec @@ -53,6 +53,7 @@ Apache Traffic Server with Apache Traffic Control modifications and environment %setup -c -T cp -far %{src}/. . cp -fa %{src}/../traffic_server_jemalloc .. +cp -fa %{src}/../trafficserver.env .. autoreconf -vfi %build @@ -81,8 +82,11 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/etc/trafficserver/snapshots mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig cp rc/trafficserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ cp ../traffic_server_jemalloc $RPM_BUILD_ROOT/opt/trafficserver/bin/ +touch $RPM_BUILD_ROOT/etc/sysconfig/trafficserver +cp ../trafficserver.env $RPM_BUILD_ROOT/etc/sysconfig/trafficserver mkdir -p "${RPM_BUILD_ROOT}"/var/log/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} @@ -124,6 +128,7 @@ fi %license LICENSE %defattr(-,root,root) %attr(644,-,-) /usr/lib/systemd/system/trafficserver.service +%attr(644,-,-) /etc/sysconfig/trafficserver %dir /opt/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} /opt/trafficserver/openssl 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/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