Merge "Cleanup modify directory"
This commit is contained in:
commit
cb535e91df
|
@ -30,7 +30,7 @@
|
|||
insertafter: "^FROM "
|
||||
line: "LABEL modified_append_tag={{ modified_append_tag }}"
|
||||
|
||||
- name: Modify image
|
||||
- name: Modify image from {{ modify_dir_path }}
|
||||
command: "{{ build_commands[container_build_tool] }} --tag {{ target_image | default(source_image) }}{{ modified_append_tag }} --file Dockerfile.modified --network host ./"
|
||||
#FIXME: buildah should not required root commands to build an image
|
||||
become: "{{ true if build_commands[container_build_tool] == 'buildah' else false }}"
|
||||
|
|
|
@ -44,3 +44,8 @@
|
|||
mode: '0555'
|
||||
|
||||
- include_tasks: modify_image.yml
|
||||
|
||||
- name: Clean modify directory
|
||||
file:
|
||||
state: absent
|
||||
path: "{{ modify_dir_path }}"
|
||||
|
|
|
@ -69,3 +69,8 @@
|
|||
mode: '0555'
|
||||
|
||||
- include_tasks: modify_image.yml
|
||||
|
||||
- name: Clean modify directory
|
||||
file:
|
||||
state: absent
|
||||
path: "{{ modify_dir_path }}"
|
||||
|
|
Loading…
Reference in New Issue