Skip to content

Commit

Permalink
Merge pull request #135 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.19-ose-network-tools

OCPBUGS-45757: Updating ose-network-tools-container image to be consistent with ART for 4.19
  • Loading branch information
openshift-merge-bot[bot] authored Dec 9, 2024
2 parents 1df82df + e2e3f80 commit d596191
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: rhel-9-release-golang-1.22-openshift-4.18
tag: rhel-9-release-golang-1.23-openshift-4.19
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/network-tools
COPY . .

# needed for ovnkube-trace
FROM registry.ci.openshift.org/ocp/4.18:ovn-kubernetes AS ovnkube-trace
FROM registry.ci.openshift.org/ocp/4.19:ovn-kubernetes AS ovnkube-trace

# tools (openshift-tools) is based off cli
FROM registry.ci.openshift.org/ocp/4.18:tools
FROM registry.ci.openshift.org/ocp/4.19:tools
COPY --from=builder /go/src/github.com/openshift/network-tools/debug-scripts/ /opt/bin/
COPY --from=ovnkube-trace /usr/bin/ovnkube-trace /usr/bin/

Expand Down

0 comments on commit d596191

Please sign in to comment.