From 4ca286f122ace7f4fa05f74313adc3d560007f1d Mon Sep 17 00:00:00 2001
From: Leo6Leo <36619969+Leo6Leo@users.noreply.github.com>
Date: Mon, 29 Sep 2025 10:09:42 -0400
Subject: [PATCH 1/2] Remove Dockerfile for RHEL7 as it is no longer needed in
 the project.

---
 Dockerfile.rhel7 | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 Dockerfile.rhel7

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
deleted file mode 100644
index 1f86c521b..000000000
--- a/Dockerfile.rhel7
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
-ARG TAGS=ocp
-WORKDIR /go/src/github.com/openshift/console-operator
-COPY . .
-ENV GO_PACKAGE github.com/openshift/console-operator
-RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="${TAGS}" -o console ./cmd/console
-
-FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
-RUN useradd console-operator
-USER console-operator
-COPY --from=builder /go/src/github.com/openshift/console-operator/console /usr/bin/console
-
-# these manifests are necessary for the installer
-COPY manifests /manifests/
-
-# out-of-the-box quickstarts
-COPY quickstarts/*.yaml /manifests/
-
-# extensions manifests generated from openshift/api types
-COPY vendor/github.com/openshift/api/console/v1/zz_generated.crd-manifests/*.crd.yaml /manifests/
-COPY vendor/github.com/openshift/api/operator/*/zz_generated.crd-manifests/*console*.crd.yaml /manifests/
-COPY vendor/github.com/openshift/api/helm/*/zz_generated.crd-manifests/*crd.yaml /manifests/
-
-LABEL io.k8s.display-name="OpenShift console-operator" \
-      io.k8s.description="This is a component of OpenShift Container Platform and manages the lifecycle of the web console." \
-      io.openshift.tags="openshift" \
-      maintainer="Jakub Hadvig <jhadvig@redhat.com>"
-
-LABEL io.openshift.release.operator true
-
-# entrypoint specified in 03-operator.yaml as `console-operator`
-# CMD ["/usr/bin/console", "operator", "--kubeconfig", "path/to/config", "--config", "./install/config.yaml", "--v", "4"]
-# CMD ["/usr/bin/console", "operator", "--v", "4"]

From 50fb27223a5fac1a08be3209b322fc3fa84825cd Mon Sep 17 00:00:00 2001
From: Leo6Leo <36619969+Leo6Leo@users.noreply.github.com>
Date: Thu, 30 Oct 2025 15:01:09 -0400
Subject: [PATCH 2/2] change the file extension

---
 Dockerfile.ocp   |  4 ++--
 Dockerfile.rhel7 | 33 ---------------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 Dockerfile.rhel7

diff --git a/Dockerfile.ocp b/Dockerfile.ocp
index 1f86c521b..0635f27d9 100644
--- a/Dockerfile.ocp
+++ b/Dockerfile.ocp
@@ -1,11 +1,11 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
 ARG TAGS=ocp
 WORKDIR /go/src/github.com/openshift/console-operator
 COPY . .
 ENV GO_PACKAGE github.com/openshift/console-operator
 RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="${TAGS}" -o console ./cmd/console
 
-FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 RUN useradd console-operator
 USER console-operator
 COPY --from=builder /go/src/github.com/openshift/console-operator/console /usr/bin/console
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
deleted file mode 100644
index 0635f27d9..000000000
--- a/Dockerfile.rhel7
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
-ARG TAGS=ocp
-WORKDIR /go/src/github.com/openshift/console-operator
-COPY . .
-ENV GO_PACKAGE github.com/openshift/console-operator
-RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="${TAGS}" -o console ./cmd/console
-
-FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
-RUN useradd console-operator
-USER console-operator
-COPY --from=builder /go/src/github.com/openshift/console-operator/console /usr/bin/console
-
-# these manifests are necessary for the installer
-COPY manifests /manifests/
-
-# out-of-the-box quickstarts
-COPY quickstarts/*.yaml /manifests/
-
-# extensions manifests generated from openshift/api types
-COPY vendor/github.com/openshift/api/console/v1/zz_generated.crd-manifests/*.crd.yaml /manifests/
-COPY vendor/github.com/openshift/api/operator/*/zz_generated.crd-manifests/*console*.crd.yaml /manifests/
-COPY vendor/github.com/openshift/api/helm/*/zz_generated.crd-manifests/*crd.yaml /manifests/
-
-LABEL io.k8s.display-name="OpenShift console-operator" \
-      io.k8s.description="This is a component of OpenShift Container Platform and manages the lifecycle of the web console." \
-      io.openshift.tags="openshift" \
-      maintainer="Jakub Hadvig <jhadvig@redhat.com>"
-
-LABEL io.openshift.release.operator true
-
-# entrypoint specified in 03-operator.yaml as `console-operator`
-# CMD ["/usr/bin/console", "operator", "--kubeconfig", "path/to/config", "--config", "./install/config.yaml", "--v", "4"]
-# CMD ["/usr/bin/console", "operator", "--v", "4"]