Skip to content

Commit

Permalink
Merge pull request k8snetworkplumbingwg#178 from s1061123/fix/pod-rhel8
Browse files Browse the repository at this point in the history
Change /usr/src/multus-cni/bin to rhel8 based one
  • Loading branch information
openshift-merge-robot committed Aug 7, 2023
2 parents 5266a61 + d779cb6 commit 8155d3f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Dockerfile.openshift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ RUN mkdir -p /usr/src/multus-cni/images && \
mkdir -p /usr/src/multus-cni/rhel9/bin && \
mkdir -p /usr/src/multus-cni/rhel8/bin
COPY --from=rhel9 /usr/src/multus-cni/bin /usr/src/multus-cni/rhel9/bin
COPY --from=rhel9 /usr/src/multus-cni/bin /usr/src/multus-cni/bin
# pod container image is RHEL8 based, so use rhel8
COPY --from=rhel8 /usr/src/multus-cni/bin /usr/src/multus-cni/bin
COPY --from=rhel8 /usr/src/multus-cni/bin /usr/src/multus-cni/rhel8/bin
ADD ./images/entrypoint.sh /

Expand Down

0 comments on commit 8155d3f

Please sign in to comment.