diff --git a/1.20/.exclude-rhel7 b/1.20/.exclude-rhel7 deleted file mode 100644 index e69de29b..00000000 diff --git a/README.md b/README.md index 4e66066f..b540b7a7 100644 --- a/README.md +++ b/README.md @@ -62,13 +62,7 @@ Choose either the CentOS Stream 9 or RHEL8 based image: $ make build TARGET=rhel8 VERSIONS=1.24 ``` -<<<<<<< HEAD * **CentOS Stream based image** -||||||| parent of 8fc0bd0 (Update README's for using RHEL8 and CentOS Stream 9.) -* **CentOS7 based image** -======= -* **CentOS Stream 9 based image** ->>>>>>> 8fc0bd0 (Update README's for using RHEL8 and CentOS Stream 9.) This image is available on DockerHub. To download it run: @@ -132,7 +126,7 @@ 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. ``` @@ -141,7 +135,7 @@ Users can choose between testing Nginx based on a RHEL or CentOS image. $ make test TARGET=rhel8 VERSIONS=1.24 ``` -* **CentOS based image** +* **CentOS Stream based image** ``` $ cd nginx-container diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index f67944b6..36da2da1 100644 --- a/imagestreams/imagestreams.yaml +++ b/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"] diff --git a/imagestreams/nginx-centos.json b/imagestreams/nginx-centos.json index 8772837d..0ef64bab 100644 --- a/imagestreams/nginx-centos.json +++ b/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": { diff --git a/imagestreams/nginx-rhel.json b/imagestreams/nginx-rhel.json index 16cf30d6..768f9d2c 100644 --- a/imagestreams/nginx-rhel.json +++ b/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": {