Remove RHEL-7 support - EOL June 2024

.github/workflows/container-tests.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "1.20", "1.22", "1.22-micro", "1.24", "1.26" ]
-        os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s", "rhel9-unsubscribed" ]
+        os_test: [ "fedora", "rhel8", "rhel9", "c9s", "rhel9-unsubscribed" ]
         test_case: [ "container" ]
 
     if: |

.github/workflows/openshift-tests.yml

@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "1.20", "1.22", "1.22-micro", "1.24", "1.26" ]
-        os_test: [ "rhel7", "rhel8", "rhel9" ]
+        os_test: [ "rhel8", "rhel9" ]
         test_case: [ "openshift-4" ]
     steps:
       - uses: sclorg/tfaga-wrapper@main

1.20/README.md

@@ -1,9 +1,8 @@
 Nginx 1.20 server and a reverse proxy server container image
 ============================================================
 This container image includes Nginx 1.20 server and a reverse server for OpenShift and general usage.
-Users can choose between RHEL, CentOS, CentOS Stream and Fedora based images.
+Users can choose between RHEL, CentOS Stream and Fedora based images.
 The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
-the CentOS images are available in the [Quay.io](https://quay.io/organization/centos7),
 the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
 and the Fedora images are available in the [Quay.io](https://quay.io/organization/fedora).
 The resulting image can be run using [podman](https://github.com/containers/libpod).
@@ -203,7 +202,7 @@ See also
 Dockerfile and other sources for this container image are available on
 https://github.com/sclorg/nginx-container.
 In that repository you also can find another versions of Python environment Dockerfiles.
-Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 it's `Dockerfile.rhel8`,
+Dockerfile for RHEL8 it's `Dockerfile.rhel8`,
 for RHEL9 it's `Dockerfile.rhel9`, Dockerfile for CentOS Stream 8 is called `Dockerfile.c8s`,
 Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`.
 

README.md

@@ -32,35 +32,34 @@ Nginx versions currently provided are:
 * [nginx-1.26](1.26)
 
 RHEL versions currently supported are:
-* RHEL7
 * RHEL8
 * RHEL9
 
-CentOS versions currently supported are:
+CentOS Stream versions currently supported are:
 * CentOS Stream 9
 
 
 Installation
 ----------------------
-Choose either the CentOS7 or RHEL7 based image:
+Choose either the CentOS Stream 9 or RHEL8 based image:
 
-*  **RHEL7 based image**
+*  **RHEL8 based image**
 
-    These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhscl/nginx-120-rhel7).
+    These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhel8/nginx-124).
     To download it run:
 
     ```
-    $ podman pull registry.access.redhat.com/rhscl/nginx-120-rhel7
+    $ podman pull registry.access.redhat.com/rhel8/nginx-124
     ```
 
-    To build a RHEL7 based Nginx image, you need to run Docker build on a properly
+    To build a RHEL8 based Nginx image, you need to run Docker build on a properly
     subscribed RHEL machine.
 
     ```
     $ git clone --recursive https://github.com/sclorg/nginx-container.git
     $ cd nginx-container
     $ git submodule update --init
-    $ make build TARGET=rhel7 VERSIONS=1.20
+    $ make build TARGET=rhel8 VERSIONS=1.24
     ```
 
 *  **CentOS Stream based image**
@@ -127,16 +126,16 @@ Users can choose between testing Nginx based on a RHEL or CentOS image.
 
 *  **RHEL based image**
 
-    To test a RHEL7 based Nginx image, you need to run the test on a properly
+    To test a RHEL8 based Nginx image, you need to run the test on a properly
     subscribed RHEL machine.
 
     ```
     $ cd nginx-container
     $ git submodule update --init
-    $ make test TARGET=rhel8 VERSIONS=1.22
+    $ make test TARGET=rhel8 VERSIONS=1.24
     ```
 
-*  **CentOS based image**
+*  **CentOS Stream based image**
 
     ```
     $ cd nginx-container

imagestreams/imagestreams.yaml

@@ -15,9 +15,6 @@
   - filename: nginx-centos.json
     latest: "1.24-ubi9"
     distros:
-      - name: UBI 7
-        app_versions: ["1.20"]
-
       - name: UBI 8
         app_versions: ["1.22"]
 
@@ -27,9 +24,6 @@
   - filename: nginx-rhel.json
     latest: "1.24-ubi9"
     distros:
-      - name: UBI 7
-        app_versions: ["1.20"]
-
       - name: UBI 8
         app_versions: ["1.22"]
 

imagestreams/nginx-centos.json

@@ -9,25 +9,6 @@
   },
   "spec": {
     "tags": [
-      {
-        "name": "1.20-ubi7",
-        "annotations": {
-          "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.",
-          "iconClass": "icon-nginx",
-          "tags": "builder,nginx",
-          "version": "1.20",
-          "sampleRepo": "https://github.com/sclorg/nginx-ex.git"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "registry.access.redhat.com/ubi7/nginx-120:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "1.22-ubi8",
         "annotations": {

imagestreams/nginx-rhel.json

@@ -9,25 +9,6 @@
   },
   "spec": {
     "tags": [
-      {
-        "name": "1.20-ubi7",
-        "annotations": {
-          "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.20 (UBI 7)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.",
-          "iconClass": "icon-nginx",
-          "tags": "builder,nginx",
-          "version": "1.20",
-          "sampleRepo": "https://github.com/sclorg/nginx-ex.git"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "registry.redhat.io/ubi7/nginx-120:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "1.22-ubi8",
         "annotations": {

test/run

@@ -25,11 +25,6 @@ TEST_LIST_HOOK_APP="test_pre_init_script"
 TEST_LIST_PERL_APP="test_perl_directive"
 TEST_LIST_MISC=run_dockerfiles_test
 
-# These tests only make sense for rhscl
-if [ "$OS" == "rhel7" ] || [ "$OS" == "centos7" ]; then
-  TEST_LIST_MISC="$TEST_LIST_MISC test_scl_enable"
-fi
-
 
 source "$test_dir/test-lib.sh"
 
@@ -384,20 +379,6 @@ function build_image() {
   check_result $?
 }
 
-test_scl_enable() {
-  echo "Testing nginx availability in Dockerfile"
-  ct_binary_found_from_df nginx
-  check_result $? || return 1
-
-  echo "Testing variable presence during \`docker exec\`"
-  ct_check_exec_env_vars
-  check_result $? || return 1
-
-  echo "Checking if all scl variables are defined in Dockerfile"
-  ct_check_scl_enable_vars
-  check_result $? || return 1
-}
-
 function run_dockerfiles_test() {
   # This is a hack for moby engine.
   # From unknown reason, moby does not like when using glob in a directory

test/run-openshift-remote-cluster

@@ -5,7 +5,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 # VERSION specifies the major version of the nginx runtime in format of X.Y
-# OS specifies RHEL version (e.g. OS=rhel7)
+# OS specifies RHEL version (e.g. OS=rhel8)
 #
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})