Update remaining images from CentOS 7 to Rocky Linux 8

zrhoffman · Jul 22, 2024 · 8b63d7e · 8b63d7e
1 parent 4ce9e8c
commit 8b63d7e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/grove/integration_test/Dockerfile b/grove/integration_test/Dockerfile
@@ -16,15 +16,15 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM centos:7
+FROM rockylinux:8
 
-RUN yum -y --setopt=tsflags=nodocs update && \
-    yum -y --setopt=tsflags=nodocs install httpd && \
-    yum -y --setopt=tsflags=nodocs install perl && \
-    yum -y --setopt=tsflags=nodocs install git && \
-    yum -y --setopt=tsflags=nodocs install golang && \
-    yum -y --setopt=tsflags=nodocs install openssl && \
-    yum clean all
+RUN dnf -y --setopt=tsflags=nodocs update && \
+    dnf -y --setopt=tsflags=nodocs install httpd && \
+    dnf -y --setopt=tsflags=nodocs install perl && \
+    dnf -y --setopt=tsflags=nodocs install git && \
+    dnf -y --setopt=tsflags=nodocs install golang && \
+    dnf -y --setopt=tsflags=nodocs install openssl && \
+    dnf clean all
 
 #EXPOSE 80
 

diff --git a/infrastructure/ansible/sample.lab/Ansible.Dockerfile b/infrastructure/ansible/sample.lab/Ansible.Dockerfile
@@ -12,23 +12,22 @@
 # limitations under the License.
 #
 
-FROM centos:7.4.1708
-MAINTAINER Jonathan Gray
-RUN yum -y install epel-release \
-  && yum -y install \
+FROM rockylinux:8
+RUN dnf -y install epel-release \
+  && dnf -y install \
   ansible \
   git \
-  python-pip \
-  python-devel \
+  python3-pip \
+  python3-devel \
   libxml2-devel \
   libxslt-devel \
   libffi-devel \
   openssl-devel \
   gcc \
-  && yum clean all \
-  && pip install --upgrade pip \
-  && pip install --upgrade setuptools \
-  && pip install --upgrade pyOpenSSL python-gilt paramiko Jinja2
+  && dnf clean all \
+  && pip3 install --upgrade pip \
+  && pip3 install --upgrade setuptools \
+  && pip3 install --upgrade pyOpenSSL python-gilt paramiko Jinja2
 RUN mkdir -p /opt/atc/ && mkdir ~/.ssh && echo -e "Host *\n   StrictHostKeyChecking no\n   UserKnownHostsFile=/dev/null" > ~/.ssh/config
 COPY . /opt/atc
 

diff --git a/traffic_router/tests/Dockerfile-test-centos b/traffic_router/tests/Dockerfile-test-centos
@@ -11,21 +11,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM centos:7
+FROM rockylinux:8
 ARG DIR=github.com/apache/trafficcontrol
 
 VOLUME ["/junit"]
 
 WORKDIR /go/src/$DIR/traffic_router
 
 RUN set -o errexit; \
-	yum -y update; \
-	yum -y install \
+	dnf -y update; \
+	dnf -y install \
 		maven \
 		java-11-openjdk \
 		epel-release; \
-	yum -y install tomcat-native; \
-	yum -y clean all
+	dnf -y install tomcat-native; \
+	dnf -y clean all
 
 ADD traffic_router /go/src/$DIR/traffic_router