Skip to content

Commit

Permalink
Merge pull request openshift#872 from openshift-bot/art-consistency-o…
Browse files Browse the repository at this point in the history
…penshift-4.16-sriov-network-config-daemon

OCPBUGS-24982: Updating sriov-network-config-daemon-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] authored Dec 21, 2023
2 parents be433eb + 551301c commit 97e5e76
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.sriov-network-config-daemon.rhel7
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
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-rhel9
FROM registry.ci.openshift.org/ocp/4.16: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" \
Expand Down

0 comments on commit 97e5e76

Please sign in to comment.