Merge pull request openshift#836 from bn222/bumpbase

Bump base images to rhel9 too
zeeke · Sep 29, 2023 · 68a8c3a · 68a8c3a
2 parents d72a2ad + c7cbaa8
commit 68a8c3a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -3,7 +3,7 @@ WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
 COPY . .
 RUN make _build-manager BIN_PATH=build/_output/cmd
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 LABEL io.k8s.display-name="OpenShift sriov-network-operator" \
       io.k8s.description="This is the component that manange and config sriov component in Openshift cluster" \
       io.openshift.tags="openshift,networking,sr-iov" \

diff --git a/Dockerfile.sriov-network-config-daemon.rhel7 b/Dockerfile.sriov-network-config-daemon.rhel7
@@ -3,7 +3,7 @@ WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
 COPY . .
 RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 RUN yum -y update && ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n mstflint ; fi) && yum -y install pciutils hwdata $ARCH_DEP_PKGS && yum clean all
 LABEL io.k8s.display-name="OpenShift sriov-network-config-daemon" \
       io.k8s.description="This is a daemon that manage and config sriov network devices in Openshift cluster" \

diff --git a/Dockerfile.webhook.rhel7 b/Dockerfile.webhook.rhel7
@@ -3,7 +3,7 @@ WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
 COPY . .
 RUN make _build-webhook BIN_PATH=build/_output/cmd
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 LABEL io.k8s.display-name="OpenShift sriov-network-webhook" \
       io.k8s.description="This is an admission controller webhook that mutates and validates customer resources of sriov network operator." \
       io.openshift.tags="openshift,networking,sr-iov" \