Skip to content

Commit

Permalink
Rename debug-network to network-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
tssurya committed Dec 17, 2020
1 parent 441fcea commit 8cdcf67
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder
WORKDIR /go/src/github.com/openshift/debug-network
WORKDIR /go/src/github.com/openshift/network-tools
COPY . .
ENV GO_PACKAGE github.com/openshift/debug-network
ENV GO_PACKAGE github.com/openshift/network-tools

FROM centos:8
COPY --from=builder /go/src/github.com/openshift/debug-network/debug-scripts/ /usr/bin/debug-network-scripts/
COPY --from=builder /go/src/github.com/openshift/network-tools/debug-scripts/ /usr/bin/debug-network-scripts/
RUN yum -y --setopt=tsflags=nodocs install git go nginx jq tcpdump traceroute wireshark net-tools nmap-ncat pciutils strace numactl make && \
yum clean all && \
curl https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/4.6.0/openshift-client-linux-4.6.0.tar.gz > /tmp/oc.tar.gz && \
Expand Down
6 changes: 3 additions & 3 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:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/github.com/openshift/debug-network
WORKDIR /go/src/github.com/openshift/network-tools
COPY . .
ENV GO_PACKAGE github.com/openshift/debug-network
ENV GO_PACKAGE github.com/openshift/network-tools

FROM registry.svc.ci.openshift.org/ocp/4.7:base
COPY --from=builder /go/src/github.com/openshift/debug-network/debug-scripts/ /usr/bin/debug-network-scripts/
COPY --from=builder /go/src/github.com/openshift/network-tools/debug-scripts/ /usr/bin/debug-network-scripts/
RUN yum -y install git go jq tcpdump nginx traceroute wireshark net-tools nmap-ncat pciutils strace numactl make; yum clean all
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ IMAGE_REGISTRY := registry.svc.ci.openshift.org
# $2 - image ref
# $3 - Dockerfile path
# $4 - context directory for image build
$(call build-image,ocp-debug-network,$(IMAGE_REGISTRY)/ocp/4.7:ocp-debug-network, ./Dockerfile,.)
$(call build-image,ocp-network-tools,$(IMAGE_REGISTRY)/ocp/4.7:ocp-network-tools, ./Dockerfile,.)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
debug-network
network-tools
=============

`debug-network` is a tool for debugging OpenShift cluster network issues.
`network-tools` is a tool for debugging OpenShift cluster network issues.
It will contain both debugging scripts (described in the next section) and useful tools that can be used
by network engineers and openshift operators to debug and diagnose issues.

Expand Down

0 comments on commit 8cdcf67

Please sign in to comment.