Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-25036: Use openshift-clients rpm rather than cli image #593

Merged
merged 1 commit into from Dec 16, 2023
Merged

OCPBUGS-25036: Use openshift-clients rpm rather than cli image #593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions images/sdn/Dockerfile.rhel
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@ COPY . .
RUN make build --warn-undefined-variables
RUN CGO_ENABLED=1 make build GO_BUILD_PACKAGES="github.com/openshift/sdn/cmd/openshift-sdn-cni" --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.15:cli AS cli
FROM registry.ci.openshift.org/ocp/4.15:base

ARG ovsver=2.13
Expand All @@ -25,14 +24,12 @@ COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /op
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn-cni /opt/cni/bin/rhel8/openshift-sdn
COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/host-local /usr/bin/cni/osdn-host-local

COPY --from=cli /usr/bin/oc /usr/bin/

RUN INSTALL_PKGS=" \
openvswitch${ovsver} container-selinux socat ethtool nmap-ncat \
libmnl libnetfilter_conntrack conntrack-tools \
libnfnetlink iproute procps-ng openssl \
iputils binutils xz util-linux dbus nftables \
tcpdump iptables" && \
tcpdump iptables openshift-clients" && \
yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False $INSTALL_PKGS && \
mkdir -p /etc/sysconfig/cni/net.d && \
yum clean all && rm -rf /var/cache/*
Expand Down