Merge "Move containerfile setting in container build"
This commit is contained in:
commit
b7f983c621
roles/build-container-image/tasks
@ -1,3 +1,7 @@
|
||||
- name: Set container filename arg
|
||||
set_fact:
|
||||
containerfile: "{{ zj_image.container_filename | default(container_filename) | default('') }}"
|
||||
|
||||
- name: Set up siblings
|
||||
include_tasks: siblings.yaml
|
||||
|
||||
|
@ -8,6 +8,10 @@
|
||||
set_fact:
|
||||
_repopath: "{{ (zj_image.repository | split('/', 1)).1 }}"
|
||||
|
||||
- name: Set container filename arg
|
||||
set_fact:
|
||||
containerfile: "{{ zj_image.container_filename | default(container_filename) | default('') }}"
|
||||
|
||||
- name: Set up siblings
|
||||
include_tasks: siblings.yaml
|
||||
|
||||
|
@ -38,10 +38,6 @@
|
||||
buildset_registry_alias: "{{ buildset_registry.host }}"
|
||||
when: buildset_registry is defined and not ( buildset_registry.host | ipaddr )
|
||||
|
||||
- name: Set container filename arg
|
||||
set_fact:
|
||||
containerfile: "{{ zj_image.container_filename | default(container_filename) | default('') }}"
|
||||
|
||||
- name: Determine if we are building multiarch or not
|
||||
set_fact:
|
||||
_multiarch: "{{ container_images | selectattr('arch', 'defined') | list }}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user