Remove SCL definition from whole container.

test/run also checks if SCL is running.
It is not valid anymore

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

2.4-micro/root/usr/libexec/httpd-prepare

@@ -4,22 +4,6 @@ set -e
 
 source ${HTTPD_CONTAINER_SCRIPTS_PATH}/common.sh
 
-# compatibility symlinks so we hide SCL paths
-if [ -v HTTPD_SCL ] ; then
-  # /opt/rh/httpd24/root/etc/httpd will be symlink to /etc/httpd
-  mv /opt/rh/httpd24/root/etc/httpd /etc/httpd
-  ln -s /etc/httpd /opt/rh/httpd24/root/etc/httpd
-
-  # /opt/rh/httpd24/root/var/run/httpd will be symlink to /var/run/httpd
-  mv /opt/rh/httpd24/root/var/run/httpd /var/run/httpd
-  ln -s /var/run/httpd /opt/rh/httpd24/root/var/run/httpd
-
-  # /opt/rh/httpd24/root/var/www will be symlink to /var/www
-  rm -rf /var/www
-  mv /opt/rh/httpd24/root/var/www /var/www
-  ln -s /var/www /opt/rh/httpd24/root/var/www
-fi
-
 mkdir -p ${HTTPD_CONFIGURATION_PATH}
 chmod -R a+rwx ${HTTPD_MAIN_CONF_PATH}
 chmod -R a+rwx ${HTTPD_MAIN_CONF_D_PATH}

2.4-micro/s2i/bin/usage

@@ -1,8 +1,13 @@
 #!/bin/sh
 
 DISTRO=`cat /etc/*-release | grep ^ID= | grep -Po '".*?"' | tr -d '"'`
-NAMESPACE=centos
-[[ $DISTRO =~ rhel* ]] && NAMESPACE=rhscl
+NAMESPACE=sclorg
+if [[ $DISTRO =~ rhel* ]]; then
+  NAMESPACE=rhel10
+  DISTRO=""
+else
+  DISTRO="-c10s"
+fi
 
 cat <<EOF
 This is a S2I ${IMAGE_DESCRIPTION} ${DISTRO} base image:

2.4/root/usr/libexec/httpd-prepare

@@ -4,22 +4,6 @@ set -e
 
 source ${HTTPD_CONTAINER_SCRIPTS_PATH}/common.sh
 
-# compatibility symlinks so we hide SCL paths
-if [ -v HTTPD_SCL ] ; then
-  # /opt/rh/httpd24/root/etc/httpd will be symlink to /etc/httpd
-  mv /opt/rh/httpd24/root/etc/httpd /etc/httpd
-  ln -s /etc/httpd /opt/rh/httpd24/root/etc/httpd
-
-  # /opt/rh/httpd24/root/var/run/httpd will be symlink to /var/run/httpd
-  mv /opt/rh/httpd24/root/var/run/httpd /var/run/httpd
-  ln -s /var/run/httpd /opt/rh/httpd24/root/var/run/httpd
-
-  # /opt/rh/httpd24/root/var/www will be symlink to /var/www
-  rm -rf /var/www
-  mv /opt/rh/httpd24/root/var/www /var/www
-  ln -s /var/www /opt/rh/httpd24/root/var/www
-fi
-
 mkdir -p ${HTTPD_CONFIGURATION_PATH}
 chmod -R a+rwx ${HTTPD_MAIN_CONF_PATH}
 chmod -R a+rwx ${HTTPD_MAIN_CONF_D_PATH}

2.4/s2i/bin/usage

@@ -1,8 +1,13 @@
 #!/bin/sh
 
 DISTRO=`cat /etc/*-release | grep ^ID= | grep -Po '".*?"' | tr -d '"'`
-NAMESPACE=centos
-[[ $DISTRO =~ rhel* ]] && NAMESPACE=rhscl
+NAMESPACE=sclorg
+if [[ $DISTRO =~ rhel* ]]; then
+  NAMESPACE=rhel10
+  DISTRO=""
+else
+  DISTRO="-c10s"
+fi
 
 cat <<EOF
 This is a S2I ${IMAGE_DESCRIPTION} ${DISTRO} base image:

test/run

@@ -8,11 +8,6 @@ test_dir="$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"
 
 . "$test_dir/test-lib.sh"
 
-function _container_is_scl() {
-  docker inspect --format='{{.Config.Env}}' "${1-$IMAGE_NAME}" | grep -q HTTPD_SCL
-  return $?
-}
-
 function run() {
     cmd="$1"
     expected_res="${2:-0}"
@@ -49,11 +44,7 @@ function run_as_root_test() {
 
 function run_log_to_volume_test() {
   _run_invalid_log_volume_test
-  if _container_is_scl ; then
-    _run_log_to_volume_test old /var/log/httpd24
-  else
-    _run_log_to_volume_test new /var/log/httpd
-  fi
+  _run_log_to_volume_test new /var/log/httpd
 }
 
 function _run_log_to_volume_test() {
@@ -86,9 +77,6 @@ function _run_invalid_log_volume_test() {
 
 
 function run_data_volume_test() {
-  if _container_is_scl ; then
-     _run_data_volume_test old /opt/rh/httpd24/root/var/www
-  fi
    _run_data_volume_test new /var/www
 }