Skip to content

Commit

Permalink
Merge pull request #17 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….7-ose-debug-network

Updating ose-debug-network builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Nov 27, 2020
2 parents 222f81a + c744812 commit aaf9bd7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.15 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/github.com/openshift/debug-network
COPY . .
ENV GO_PACKAGE github.com/openshift/debug-network

FROM registry.svc.ci.openshift.org/ocp/4.6:cli
FROM registry.svc.ci.openshift.org/ocp/4.7:base
COPY --from=builder /go/src/github.com/openshift/debug-network/debug-scripts/* /usr/bin/
RUN yum -y install jq tcpdump traceroute net-tools nmap-ncat pciutils strace numactl; yum clean all

0 comments on commit aaf9bd7

Please sign in to comment.