This is an automated email from the ASF dual-hosted git repository.
friede 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 2df128c1fe Make the socksproxy image for CDN in a Box use CentOS 7
(#7650)
2df128c1fe is described below
commit 2df128c1fe5d25362a7c255614a3e9ceaa6e5505
Author: Zach Hoffman <[email protected]>
AuthorDate: Fri Jul 14 12:22:33 2023 -0600
Make the socksproxy image for CDN in a Box use CentOS 7 (#7650)
* Set default RHEL_VERSION for socksproxy to 7
* Change default base image for socksproxy to centos
* Might as well upate Dante to 1.4.3 while we're in here
---
.../cdn-in-a-box/optional/docker-compose.socksproxy.yml | 3 ++-
infrastructure/cdn-in-a-box/optional/socksproxy/Dockerfile | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/optional/docker-compose.socksproxy.yml
b/infrastructure/cdn-in-a-box/optional/docker-compose.socksproxy.yml
index ce8bc5cc4e..9e42a9ad61 100644
--- a/infrastructure/cdn-in-a-box/optional/docker-compose.socksproxy.yml
+++ b/infrastructure/cdn-in-a-box/optional/docker-compose.socksproxy.yml
@@ -45,7 +45,8 @@ services:
context: .
dockerfile: optional/socksproxy/Dockerfile
args:
- RHEL_VERSION: 8
+ BASE_IMAGE: centos
+ RHEL_VERSION: 7
hostname: socksproxy
domainname: infra.ciab.test
volumes:
diff --git a/infrastructure/cdn-in-a-box/optional/socksproxy/Dockerfile
b/infrastructure/cdn-in-a-box/optional/socksproxy/Dockerfile
index 0c6e8cb6ed..75f3dfd7da 100644
--- a/infrastructure/cdn-in-a-box/optional/socksproxy/Dockerfile
+++ b/infrastructure/cdn-in-a-box/optional/socksproxy/Dockerfile
@@ -20,16 +20,16 @@
# Based on Rocky Linux 8
############################################################
# Change BASE_IMAGE to centos when RHEL_VERSION=7
-ARG BASE_IMAGE=rockylinux \
- RHEL_VERSION=8
+ARG BASE_IMAGE=centos \
+ RHEL_VERSION=7
FROM ${BASE_IMAGE}:${RHEL_VERSION}
-ARG RHEL_VERSION=8
+ARG RHEL_VERSION=7
RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
yum -y install dnf || exit 1; \
fi
-ARG DANTES_SRC=https://www.inet.no/dante/files/dante-1.4.2.tar.gz
+ARG DANTES_SRC=https://www.inet.no/dante/files/dante-1.4.3.tar.gz
RUN dnf install -y net-tools bind-utils iproute wget curl automake autoconf
gcc make && \
curl -Ls -o /tmp/dante.tar.gz $DANTES_SRC && \
