fix: COPY yq into final image for modules

blue-build · Feb 26, 2024 · 0fd06ca · 0fd06ca
1 parent ce8f889
commit 0fd06ca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           earthly account login --token ${{ secrets.EARTHLY_SAT_TOKEN }} >> /dev/null
           earthly org s blue-build
-          earthly sat s blue-build
+          earthly sat s blue-build-tag
 
       - name: Set up Python
         uses: actions/setup-python@v5

diff --git a/templates/Containerfile.j2 b/templates/Containerfile.j2
@@ -46,9 +46,10 @@ 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/templates/modules/modules.j2 b/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 \