Skip to content

build: Remove rocksdb dependencies from Konflux builder stage #14728

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

Merged
msugakov merged 2 commits into from
Apr 4, 2025
Merged

build: Remove rocksdb dependencies from Konflux builder stage #14728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3669205
Remove rocksdb build dependencies from Konflux builder stage
msugakov Mar 24, 2025
506b989
Restore `jq` and separate Go build and swagger steps
msugakov Mar 25, 2025
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: 4 additions & 3 deletions image/rhel/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN /tmp/.konflux/subscription-manager-bro.sh cleanup

FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23 AS go-builder

RUN dnf -y install --allowerasing make automake gcc gcc-c++ coreutils binutils diffutils zlib-devel bzip2-devel lz4-devel cmake jq
RUN dnf -y install --allowerasing jq

WORKDIR /go/src/github.com/stackrox/rox/app

Expand All @@ -48,8 +48,9 @@ ENV GOEXPERIMENT=strictfipsruntime
ENV CI=1

RUN # TODO(ROX-13200): make sure roxctl cli is built without running go mod tidy. \
make main-build-nodeps cli-build && \
mkdir -p image/rhel/docs/api/v1 && \
make main-build-nodeps cli-build

RUN mkdir -p image/rhel/docs/api/v1 && \
./scripts/mergeswag.sh 1 generated/api/v1 central/docs/api_custom_routes >image/rhel/docs/api/v1/swagger.json && \
mkdir -p image/rhel/docs/api/v2 && \
./scripts/mergeswag.sh 2 generated/api/v2 >image/rhel/docs/api/v2/swagger.json
Expand Down
Loading