Skip to content

OCPBUGS-83863: Remove rhel8 build stage, strip debug info #228

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

Open
sdodson wants to merge 3 commits into
base: main
Choose a base branch
from
+7 −15
Open

OCPBUGS-83863: Remove rhel8 build stage, strip debug info #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7eb28a
Dockerfile: remove rhel8 build stage and use rhel9 as base
sdodson Apr 28, 2026
0ab1d69
Dockerfile: use hardlinks for rhel9/bin/ instead of a separate COPY
sdodson Apr 28, 2026
25477af
build_linux.sh: strip symbols and debug info from binaries
sdodson Apr 28, 2026
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
17 changes: 3 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,7 @@ RUN ./build_linux.sh && \
cd /usr/src/plugins/bin
WORKDIR /

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 AS rhel8
COPY . /usr/src/plugins
WORKDIR /usr/src/plugins
ENV CGO_ENABLED=0
RUN ./build_linux.sh && \
cd /usr/src/plugins/bin
WORKDIR /

FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 AS windows
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS windows
COPY . /usr/src/plugins
WORKDIR /usr/src/plugins
ENV CGO_ENABLED=0
Expand All @@ -25,13 +17,10 @@ WORKDIR /

FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
RUN mkdir -p /usr/src/plugins/bin && \
mkdir -p /usr/src/plugins/rhel8/bin && \
mkdir -p /usr/src/plugins/rhel9/bin && \
mkdir -p /usr/src/plugins/windows/bin
COPY --from=rhel8 /usr/src/plugins/bin/* /usr/src/plugins/rhel8/bin/
# pod container image is RHEL8 based, so use rhel8
COPY --from=rhel8 /usr/src/plugins/bin/* /usr/src/plugins/bin/
COPY --from=rhel9 /usr/src/plugins/bin/* /usr/src/plugins/rhel9/bin/
COPY --from=rhel9 /usr/src/plugins/bin/* /usr/src/plugins/bin/
RUN ln /usr/src/plugins/bin/* /usr/src/plugins/rhel9/bin/
COPY --from=windows /usr/src/plugins/bin/* /usr/src/plugins/windows/bin/

LABEL io.k8s.display-name="Container Networking Plugins" \
Expand Down
5 changes: 4 additions & 1 deletion build_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ export GOFLAGS="${GOFLAGS} -mod=vendor"

mkdir -p "${PWD}/bin"

# Prepend -s -w to any caller-supplied ldflags so strip flags are always present.
LDFLAGS="-s -w ${LDFLAGS:-}"

echo "Building plugins ${GOOS}"
PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/*"
for d in $PLUGINS; do
if [ -d "$d" ]; then
plugin="$(basename "$d")"
if [ "${plugin}" != "windows" ]; then
echo " $plugin"
${GO:-go} build -o "${PWD}/bin/$plugin" "$@" ./"$d"
${GO:-go} build -o "${PWD}/bin/$plugin" -ldflags "$LDFLAGS" "$@" ./"$d"

@sdodson sdodson Jun 9, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@bpickard22 Should I be pushing these changes upstream?

fi
fi
done