From c16015403ca04425de1e94d4dbc84b136dc1cf4b Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Wed, 10 Aug 2022 10:11:07 +0200 Subject: [PATCH] disable Centos Stream versions both rhel8 and rhel9 images are available in UBI --- .github/workflows/build-and-push.yml | 14 ------ .github/workflows/container-tests.yml | 14 ------ 2.4/Dockerfile.c8s | 66 --------------------------- 2.4/Dockerfile.c9s | 66 --------------------------- README.md | 4 -- 5 files changed, 164 deletions(-) delete mode 100644 2.4/Dockerfile.c8s delete mode 100644 2.4/Dockerfile.c9s diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 012f9580..2d1a9ef0 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -22,20 +22,6 @@ jobs: suffix: "centos7" quayio_username: "QUAY_IMAGE_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_BUILDER_TOKEN" - - dockerfile_path: "2.4" - dockerfile: "Dockerfile.c9s" - registry_namespace: "sclorg" - tag: "c9s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - suffix: "c9s" - - dockerfile_path: "2.4" - dockerfile: "Dockerfile.c8s" - registry_namespace: "sclorg" - tag: "c8s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - suffix: "c8s" - dockerfile_path: "2.4" dockerfile: "Dockerfile.fedora" registry_namespace: "fedora" diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml index 66ef1622..0bba34bf 100644 --- a/.github/workflows/container-tests.yml +++ b/.github/workflows/container-tests.yml @@ -59,20 +59,6 @@ jobs: branch: "master" tmt_repo: "https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans" tf_scope: "private" - - tmt_plan: "c9s" - os_test: "c9s" - context: "CentOS Stream 9" - compose: "CentOS-Stream-9" - api_key: "TF_PUBLIC_API_KEY" - branch: "main" - tmt_repo: "https://github.com/sclorg/sclorg-testing-farm" - - tmt_plan: "c8s" - os_test: "c8s" - context: "CentOS Stream 8" - compose: "CentOS-Stream-8" - api_key: "TF_PUBLIC_API_KEY" - branch: "main" - tmt_repo: "https://github.com/sclorg/sclorg-testing-farm" if: | github.event.issue.pull_request diff --git a/2.4/Dockerfile.c8s b/2.4/Dockerfile.c8s deleted file mode 100644 index 033056ca..00000000 --- a/2.4/Dockerfile.c8s +++ /dev/null @@ -1,66 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c8s:c8s - -# Apache HTTP Server image. -# -# Volumes: -# * /var/www - Datastore for httpd -# * /var/log/httpd24 - Storage for logs when $HTTPD_LOG_TO_VOLUME is set -# Environment: -# * $HTTPD_LOG_TO_VOLUME (optional) - When set, httpd will log into /var/log/httpd24 - -ENV HTTPD_VERSION=2.4 - -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, \ -and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ -which extend the core functionality. \ -These can range from server-side programming language support to authentication schemes. \ -Virtual hosting allows one Apache installation to serve many different Web sites." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ - io.openshift.expose-services="8080:http,8443:https" \ - io.openshift.tags="builder,httpd,httpd-24" \ - name="sclorg/httpd-24-c8s" \ - version="1" \ - com.redhat.component="httpd-24-container" \ - usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quay.io/sclorg/httpd-242-c8s:c8s sample-server" \ - maintainer="SoftwareCollections.org " - -EXPOSE 8080 -EXPOSE 8443 - -RUN yum -y module enable httpd:$HTTPD_VERSION && \ - INSTALL_PKGS="gettext hostname nss_wrapper bind-utils httpd mod_ssl mod_ldap mod_session mod_security mod_auth_mellon sscg" && \ - yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - yum -y clean all --enablerepo='*' - -ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ - HTTPD_APP_ROOT=${APP_ROOT} \ - HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/httpd.d \ - HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \ - HTTPD_MAIN_CONF_MODULES_D_PATH=/etc/httpd/conf.modules.d \ - HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \ - HTTPD_TLS_CERT_PATH=/etc/httpd/tls \ - HTTPD_VAR_RUN=/var/run/httpd \ - HTTPD_DATA_PATH=/var/www \ - HTTPD_DATA_ORIG_PATH=/var/www \ - HTTPD_LOG_PATH=/var/log/httpd - -COPY ./s2i/bin/ $STI_SCRIPTS_PATH -COPY ./root / - -# Reset permissions of filesystem to default values -RUN /usr/libexec/httpd-prepare && rpm-file-permissions - -USER 1001 - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["${HTTPD_DATA_PATH}"] -# VOLUME ["${HTTPD_LOG_PATH}"] - -CMD ["/usr/bin/run-httpd"] diff --git a/2.4/Dockerfile.c9s b/2.4/Dockerfile.c9s deleted file mode 100644 index 47b9feeb..00000000 --- a/2.4/Dockerfile.c9s +++ /dev/null @@ -1,66 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c9s:c9s - -# Apache HTTP Server image. -# -# Volumes: -# * /var/www - Datastore for httpd -# * /var/log/httpd24 - Storage for logs when $HTTPD_LOG_TO_VOLUME is set -# Environment: -# * $HTTPD_LOG_TO_VOLUME (optional) - When set, httpd will log into /var/log/httpd24 - -ENV HTTPD_VERSION=2.4 - -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, \ -and extensible web server. Apache supports a variety of features, many implemented as compiled modules \ -which extend the core functionality. \ -These can range from server-side programming language support to authentication schemes. \ -Virtual hosting allows one Apache installation to serve many different Web sites." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="Apache httpd $HTTPD_VERSION" \ - io.openshift.expose-services="8080:http,8443:https" \ - io.openshift.tags="builder,httpd,httpd-24" \ - name="sclorg/httpd-24-c9s" \ - version="1" \ - com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \ - com.redhat.component="httpd-24-container" \ - usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quay.io/sclorg/httpd-24-c9s sample-server" \ - maintainer="SoftwareCollections.org " - -EXPOSE 8080 -EXPOSE 8443 - -RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils httpd mod_ssl mod_ldap mod_session mod_security mod_auth_mellon sscg" && \ - yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - yum -y clean all --enablerepo='*' - -ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ - HTTPD_APP_ROOT=${APP_ROOT} \ - HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/httpd.d \ - HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \ - HTTPD_MAIN_CONF_MODULES_D_PATH=/etc/httpd/conf.modules.d \ - HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \ - HTTPD_TLS_CERT_PATH=/etc/httpd/tls \ - HTTPD_VAR_RUN=/var/run/httpd \ - HTTPD_DATA_PATH=/var/www \ - HTTPD_DATA_ORIG_PATH=/var/www \ - HTTPD_LOG_PATH=/var/log/httpd - -COPY ./s2i/bin/ $STI_SCRIPTS_PATH -COPY ./root / - -# Reset permissions of filesystem to default values -RUN /usr/libexec/httpd-prepare && rpm-file-permissions - -USER 1001 - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["${HTTPD_DATA_PATH}"] -# VOLUME ["${HTTPD_LOG_PATH}"] - -CMD ["/usr/bin/run-httpd"] diff --git a/README.md b/README.md index 7d0967bf..4eb65b55 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ Apache HTTP Server Container Images Images available on Quay are: * CentOS 7 [httpd-24](https://quay.io/repository/centos7/httpd-24-centos7) -* CentOS Stream 8 [httpd-2.4](https://quay.io/repository/sclorg/httpd-24-c8s) -* CentOS Stream 9 [httpd-2.4](https://quay.io/repository/sclorg/httpd-24-c9s) * Fedora [httpd-2.4](https://quay.io/repository/fedora/httpd-24) This repository contains Dockerfiles for Apache HTTP Server images for OpenShift and general usage. @@ -30,8 +28,6 @@ RHEL versions currently supported are: CentOS versions currently supported are: * CentOS 7 -* CentOS Stream 8 -* CentOS Stream 9 Installation