Skip to content

Commit

Permalink
Make the socksproxy image for CDN in a Box use CentOS 7 (#7650)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
zrhoffman committed Jul 14, 2023
1 parent e76e1c2 commit 2df128c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions infrastructure/cdn-in-a-box/optional/socksproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit 2df128c

Please sign in to comment.