You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2022/02/01 20:58:38 UTC
[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #6530: Fixes the cache-config integration tests.
zrhoffman commented on a change in pull request #6530:
URL: https://github.com/apache/trafficcontrol/pull/6530#discussion_r797008373
##########
File path: cache-config/testing/docker/docker-compose.yml
##########
@@ -57,6 +57,9 @@ services:
ports:
- "443:443"
build:
+ args:
+ - OS_DISTRO==${OS_DISTRO:-rockylinux/rockylinux}
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
##########
File path: cache-config/testing/docker/traffic_ops/Dockerfile
##########
@@ -20,19 +20,23 @@
# Based on CentOS 8
############################################################
-ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION}
-ARG RHEL_VERSION=8
-# Makes RHEL_VERSION available in later layers without needing to specify it again
-ENV RHEL_VERSION=$RHEL_VERSION
+ARG OS_VERSION=8
+ARG OS_DISTRO=rockylinux/rockylinux
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
##########
File path: cache-config/testing/docker/docker-compose-ats-build.yml
##########
@@ -26,19 +26,13 @@ volumes:
services:
trafficserver_build:
- environment:
- - ATS_VERSION=8.1.x
- - CJOSE_URL=https://github.com/cisco/cjose
- - CJOSE_TAG=latest
- - JANSSON_URL=https://github.com/akheron/jansson
- - JANSSON_TAG=v2.11
- - OPENSSL_URL=https://github.com/openssl/openssl
- - OPENSSL_TAG=OpenSSL_1_1_1
- - RUN_ATS_UNIT_TESTS=false
+ env_file:
+ - variables.env
build:
context: ../../..
dockerfile: cache-config/testing/docker/trafficserver/Dockerfile
args:
- RHEL_VERSION: ${RHEL_VERSION:-8}
+ - OS_VERSION=${OS_VERSION:-8}
+ - OS_DISTRO=${OS_DISTRO:-rockylinux/rockylinux}
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
##########
File path: cache-config/testing/docker/docker-compose.yml
##########
@@ -82,7 +85,8 @@ services:
- variables.env
build:
args:
- RHEL_VERSION: ${RHEL_VERSION:-8}
+ - OS_DISTRO=${OS_DISTRO:-rockylinux/rockylinux}
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
##########
File path: cache-config/testing/docker/trafficserver/Dockerfile
##########
@@ -19,31 +19,34 @@
# Dockerfile to build Traffic Server RPM
###############################################################
-ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION}
-ARG RHEL_VERSION=8
+ARG OS_VERSION=8
+ARG OS_DISTRO=rockylinux/rockylinux
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
##########
File path: cache-config/testing/docker/variables.env
##########
@@ -15,6 +15,10 @@
# specific language governing permissions and limitations
# under the License.
#
+# OS_DISTRO may be set to "centos", default is "rockylinux/rockylinux" since RHEL 8
+OS_DISTRO=rockylinux/rockylinux
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
##########
File path: cache-config/testing/docker/ort_test/Dockerfile
##########
@@ -23,14 +23,19 @@
# The recommended minimum size for each block devices is 1G.
# For example, `sudo modprobe brd rd_size=1048576 rd_nr=2`
-ARG RHEL_VERSION=8
-FROM centos:${RHEL_VERSION}
-ARG RHEL_VERSION=8
+ARG OS_VERSION=8
+ARG OS_DISTRO=rockylinux/rockylinux
Review comment:
Rocky Linux now has an official image, `rockylinux/rockylinux` can be just `rockylinux`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@trafficcontrol.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org