Merge pull request #566 from jcaamano/pods-oc-release-4.7

[release-4.7] OCPBUGS-16891: Add /usr/bin/oc to image simiar to openshift-ovn-kubernetes
openshift · Jul 28, 2023 · 7eb4c7e · 7eb4c7e
2 parents 86c9e30 + e795f1d
commit 7eb4c7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/images/sdn/Dockerfile.fedora b/images/sdn/Dockerfile.fedora
@@ -1,6 +1,9 @@
 # This can be used to build images for testing
+FROM registry.ci.openshift.org/ocp/4.7:cli AS cli
 FROM fedora:32
 
+COPY --from=cli /usr/bin/oc /usr/bin/
+
 RUN INSTALL_PKGS=" \
       openvswitch container-selinux socat ethtool nmap-ncat \
       libmnl libnetfilter_conntrack conntrack-tools \

diff --git a/images/sdn/Dockerfile.rhel b/images/sdn/Dockerfile.rhel
@@ -10,6 +10,7 @@ COPY . .
 RUN make build --warn-undefined-variables
 RUN CGO_ENABLED=1 make build GO_BUILD_PACKAGES="github.com/openshift/sdn/cmd/sdn-cni-plugin" --warn-undefined-variables
 
+FROM registry.ci.openshift.org/ocp/4.7:cli AS cli
 FROM registry.ci.openshift.org/ocp/4.7:base
 RUN mkdir -p /opt/cni/bin/rhel8
 COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/openshift-sdn /usr/bin/openshift-sdn-node
@@ -21,6 +22,8 @@ COPY --from=rhel8-builder /go/src/github.com/openshift/sdn/host-local /usr/bin/c
 RUN mkdir -p /opt/cni/bin/rhel7
 COPY --from=rhel7-builder /go/src/github.com/openshift/sdn/sdn-cni-plugin /opt/cni/bin/rhel7/openshift-sdn
 
+COPY --from=cli /usr/bin/oc /usr/bin/
+
 RUN INSTALL_PKGS=" \
       openvswitch2.13 container-selinux socat ethtool nmap-ncat \
       libmnl libnetfilter_conntrack conntrack-tools \