Skip to content

Commit

Permalink
Merge pull request #566 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.10-sriov-network-must-gather

Updating sriov-network-must-gather images to be consistent with ART
  • Loading branch information
openshift-merge-robot authored Sep 17, 2021
2 parents 5e1261d + d16483c commit 9c23064
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: golang-1.15
tag: rhel-8-release-golang-1.16-openshift-4.10
4 changes: 2 additions & 2 deletions must-gather/Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
WORKDIR /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator
COPY . .

FROM registry.ci.openshift.org/ocp/4.9:base
FROM registry.ci.openshift.org/ocp/4.10:base
LABEL io.k8s.display-name="sriov-network-operator-must-gather" \
io.k8s.description="This is a sriov must-gather image that collectes sriov network operator related resources."
COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/must-gather/collection-scripts/* /usr/bin/
Expand Down

0 comments on commit 9c23064

Please sign in to comment.