particle-os/particle-os-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: COPY yq for final image for modules to work

Browse source
This commit is contained in:
Gerald Pinder 2024-02-26 09:21:54 -05:00
parent 1978339993
commit fd94962ff5
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
template/templates/Containerfile.j2
View file

@ -46,9 +46,11 @@ ARG CONFIG_DIRECTORY="/tmp/config"
ARG IMAGE_NAME="{{ recipe.name }}" ARG IMAGE_NAME="{{ recipe.name }}"
ARG BASE_IMAGE="{{ recipe.base_image }}" 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" %} {%- include "modules/modules.j2" %}
COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign
COPY --from=ghcr.io/blue-build/cli: COPY --from=ghcr.io/blue-build/cli:
{%- if let Some(tag) = recipe.blue_build_tag -%} {%- if let Some(tag) = recipe.blue_build_tag -%}
{{ tag }} {{ tag }}

1
template/templates/modules/modules.j2
View file

@ -8,7 +8,6 @@
RUN \ RUN \
--mount=type=tmpfs,target=/tmp \ --mount=type=tmpfs,target=/tmp \
--mount=type=tmpfs,target=/var \ --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 \ --mount=type=bind,from=stage-config,src=/config,dst=/tmp/config,rw \
{%- if let Some(source) = module.source %} {%- if let Some(source) = module.source %}
--mount=type=bind,from={{ source }},src=/modules,dst=/tmp/modules,rw \ --mount=type=bind,from={{ source }},src=/modules,dst=/tmp/modules,rw \