From 379b2785207be9af5b605609bbf74daef0b5ff65 Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Wed, 7 Aug 2024 10:32:25 +0200
Subject: [PATCH] Couple small updates in C10S

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 2.4/Dockerfile.c10s  | 7 ++++---
 2.4/Dockerfile.rhel9 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/2.4/Dockerfile.c10s b/2.4/Dockerfile.c10s
index 7bcb3703..14f24228 100644
--- a/2.4/Dockerfile.c10s
+++ b/2.4/Dockerfile.c10s
@@ -10,7 +10,8 @@ FROM quay.io/sclorg/s2i-core-c10s:c10s
 
 ENV HTTPD_VERSION=2.4 \
     HTTPD_SHORT_VERSION=24 \
-    NAME=httpd
+    NAME=httpd \
+    ARCH=x86_64
 
 ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \
     DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \
@@ -36,10 +37,10 @@ EXPOSE 8080
 EXPOSE 8443
 
 RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils httpd mod_ssl mod_ldap mod_session sscg" && \
-    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+    dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \
-    yum -y clean all --enablerepo='*'
+    dnf -y clean all --enablerepo='*'
 
 ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
     HTTPD_APP_ROOT=${APP_ROOT} \
diff --git a/2.4/Dockerfile.rhel9 b/2.4/Dockerfile.rhel9
index 2c8d07a6..01a44f3e 100644
--- a/2.4/Dockerfile.rhel9
+++ b/2.4/Dockerfile.rhel9
@@ -10,7 +10,7 @@ FROM ubi9/s2i-core:1
 
 ENV HTTPD_VERSION=2.4 \
     HTTPD_SHORT_VERSION=24 \
-    NAME
+    NAME=httpd
 
 ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \
     DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \