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

feat(modules)!: Allow containerfile module to print out to main Containerfile

Browse source
This commit is contained in:
Gerald Pinder 2023-10-27 17:53:32 -04:00
parent 52936fffb1
commit 9564ca0af3
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
templates/Containerfile.modules
View file

@ -27,17 +27,16 @@ ARG CONFIG_DIRECTORY="/tmp/config"
ARG IMAGE_NAME="{{ name }}"
ARG BASE_IMAGE="{{ base_image }}"
{% if containerfiles and containerfiles.pre %}
# Pre: Containerfiles
{% for containerfile in containerfiles.pre %}
{{ print_containerfile(containerfile = containerfile) }}
{% endfor %}
{% endif %}
{% macro run_modules(module) %}
{% if module.type %}
{% if module.type == "containerfile" %}
{% for c in module.containerfiles %}
{{ print_containerfile(containerfile = c ) }}
{% endfor %}
{% else %}
RUN chmod +x /tmp/modules/{{ module.type }}/{{ module.type }}.sh
RUN source /tmp/exports.sh && OS_VERSION="$(grep -Po '(?<=VERSION_ID=)\d+' /usr/lib/os-release)" /tmp/modules/{{ module.type }}/{{ module.type }}.sh "$(echo -e "{{ print_module_context(module = module) }}")"
{% endif %}
{% elif module["from-file"] %}
{% set extra_module = get_module_from_file(file = module["from-file"]) %}
{% for m in extra_module.modules %}
@ -50,10 +49,4 @@ RUN source /tmp/exports.sh && OS_VERSION="$(grep -Po '(?<=VERSION_ID=)\d+' /usr/
{{ self::run_modules(module = module) }}
{% endfor %}
{% if containerfiles and containerfiles.post %}
{% for containerfile in containerfiles.post %}
{{ print_containerfile(containerfile = containerfile) }}
{% endfor %}
{% endif %}
RUN rm -rf /tmp/* /var/* && ostree container commit