From fd94962ff572499346ad3d2791e5cf3072ff4a0e Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Mon, 26 Feb 2024 09:21:54 -0500 Subject: [PATCH] fix: COPY yq for final image for modules to work --- template/templates/Containerfile.j2 | 4 +++- template/templates/modules/modules.j2 | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/template/templates/Containerfile.j2 b/template/templates/Containerfile.j2 index 21f8de8..0721297 100644 --- a/template/templates/Containerfile.j2 +++ b/template/templates/Containerfile.j2 @@ -46,9 +46,11 @@ ARG CONFIG_DIRECTORY="/tmp/config" ARG IMAGE_NAME="{{ recipe.name }}" ARG BASE_IMAGE="{{ recipe.base_image }}" +COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign +COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq + {%- include "modules/modules.j2" %} -COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign COPY --from=ghcr.io/blue-build/cli: {%- if let Some(tag) = recipe.blue_build_tag -%} {{ tag }} diff --git a/template/templates/modules/modules.j2 b/template/templates/modules/modules.j2 index 26f7233..0ac9af2 100644 --- a/template/templates/modules/modules.j2 +++ b/template/templates/modules/modules.j2 @@ -8,7 +8,6 @@ RUN \ --mount=type=tmpfs,target=/tmp \ --mount=type=tmpfs,target=/var \ - --mount=type=bind,from=docker.io/mikefarah/yq,src=/usr/bin/yq,dst=/usr/bin/yq \ --mount=type=bind,from=stage-config,src=/config,dst=/tmp/config,rw \ {%- if let Some(source) = module.source %} --mount=type=bind,from={{ source }},src=/modules,dst=/tmp/modules,rw \