From 3669205d8dd17010b3fc24f48d356515a10bf101 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Mon, 24 Mar 2025 20:40:11 +0100 Subject: [PATCH 1/2] Remove rocksdb build dependencies from Konflux builder stage --- image/rhel/konflux.Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/image/rhel/konflux.Dockerfile b/image/rhel/konflux.Dockerfile index 55fe3553565e1..82446ada17a2b 100644 --- a/image/rhel/konflux.Dockerfile +++ b/image/rhel/konflux.Dockerfile @@ -29,8 +29,6 @@ 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 - WORKDIR /go/src/github.com/stackrox/rox/app COPY . . From 506b9896e0169c7107f640ddcff9b6379382802c Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Tue, 25 Mar 2025 10:23:47 +0100 Subject: [PATCH 2/2] Restore `jq` and separate Go build and swagger steps There's a build error without `jq` ``` xargs: jq: No such file or directory subprocess exited with status 127 subprocess exited with status 127 Error: building at STEP "RUN . /cachi2/cachi2.env && make main-build-nodeps cli-build && 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": exit status 127 ``` https://console.redhat.com/application-pipeline/workspaces/rh-acs/applications/acs/pipelineruns/main-on-push-8rzb6 Supposedly, that's from Swagger generation scripts therefore I separate them to have failures more isolated in the future. --- image/rhel/konflux.Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/image/rhel/konflux.Dockerfile b/image/rhel/konflux.Dockerfile index 82446ada17a2b..3c49daf408030 100644 --- a/image/rhel/konflux.Dockerfile +++ b/image/rhel/konflux.Dockerfile @@ -29,6 +29,8 @@ 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 jq + WORKDIR /go/src/github.com/stackrox/rox/app COPY . . @@ -46,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