From 6953607b6ef52fd3f0bef7059d2c926767b1022b Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Wed, 24 Jul 2024 10:30:10 +0200 Subject: [PATCH] Dockerfile: Inject merge_syft_sbom script to /usr/local/bin When commit 49ba69d0 converted the image build to multi-stage it forgot to install the merge_syft_sbom.py utility script that was previously installed as part of copying the whole repo into the image to /src/utils/merge_syft_sbom.py. This patch takes a bit of a different path by installing the script as a utility binary to a more standardized location. Fixes: 49ba69d0de05addbca966b683f75f8a71fcbd1c1 Resolves: https://github.com/containerbuildsystem/cachi2/issues/582 Signed-off-by: Erik Skultety --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 04c584746..21c7dda7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,7 @@ COPY --from=golang_121 /usr/local/go /usr/local/go/go1.21 COPY --from=node_223 /usr/local/lib/node_modules/corepack /usr/local/lib/corepack COPY --from=node_223 /usr/local/bin/node /usr/local/bin/node COPY --from=builder /venv /venv +COPY --from=builder /src/utils/merge_syft_sbom.py /usr/local/bin/merge_syft_sbom # link corepack, yarn, and go to standard PATH location RUN ln -s /usr/local/lib/corepack/dist/corepack.js /usr/local/bin/corepack && \