Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@ WORKDIR /go/src/github.com/openshift/bond-cni
COPY . .
RUN ./build.sh

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.26-openshift-5.0 AS rhel8
WORKDIR /go/src/github.com/openshift/bond-cni
COPY . .
RUN ./build.sh

FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
LABEL io.k8s.display-name="bond-cni" \
io.k8s.description="This is an image containing the bond-cni executable" \
io.openshift.tags="openshift"

COPY --from=rhel9 /go/src/github.com/openshift/bond-cni/bin/bond /bondcni/rhel9/bond
COPY --from=rhel9 /go/src/github.com/openshift/bond-cni/bin/bond /bondcni/bond
COPY --from=rhel8 /go/src/github.com/openshift/bond-cni/bin/bond /bondcni/rhel8/bond
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ set -e
echo "Building bond-cni plugins"

export GO111MODULE=on
go build --mod=vendor -o ./bin/bond ./bond/
go build --mod=vendor -ldflags '-s -w' -o ./bin/bond ./bond/

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build.sh is planned to be removed since is single line and if changed we should be change upstream (https://github.com/k8snetworkplumbingwg/bond-cni).
So for this PR can you make no changes here and simply replace the RUN ./build.sh in the Dockerfile.openshift instead?