Skip to content

ci: return bundle build to ubi9, remove golang builder use #13218

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

Closed
davdhacs wants to merge 1 commit into from
Closed

ci: return bundle build to ubi9, remove golang builder use #13218

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions operator/konflux.bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
FROM registry.access.redhat.com/ubi9:latest AS ubi-repo-donor
FROM registry.access.redhat.com/ubi9:latest AS builder-runner

FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS builder-runner

# For some reason, openshift-golang-builder 9 comes without any RPM repos in /etc/yum.repos.d/
# We, however, need to install some packages and so we need to configure RPM repos. The ones for UBI are sufficient.
COPY --from=ubi-repo-donor /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
RUN dnf -y upgrade --nobest && dnf -y install --nodocs --noplugins jq python3-pip

COPY ./operator/bundle_helpers/requirements.txt /tmp/requirements.txt
Expand Down Expand Up @@ -66,11 +61,6 @@ ARG RELATED_IMAGE_CENTRAL_DB
ENV RELATED_IMAGE_CENTRAL_DB=$RELATED_IMAGE_CENTRAL_DB
RUN echo "Checking required RELATED_IMAGE_CENTRAL_DB"; [[ "${RELATED_IMAGE_CENTRAL_DB}" != "" ]]

# Reset GOFLAGS='-mod=vendor' value which comes by default in openshift-golang-builder and causes build errors like
# go: inconsistent vendoring in /stackrox/operator/tools/operator-sdk:
# github.com/operator-framework/operator-lifecycle-manager@v0.27.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
ENV GOFLAGS=''

RUN mkdir -p build/ && \
rm -rf build/bundle && \
cp -a bundle build/ && \
Expand Down