openstack
/
ansible-role-tripleo-modify-image
Code Issues Proposed changes

Force docker format 

The undercloud registry currently doesn't handle OCI formated images
correctly. We need to ensure that when buildah is run, we specify that
we want the docker format until we correctly support the OCI metadata.

Change-Id: Icf1a1c8f3a353239f2d244aa0bc811f8f86f6867
Related-Bug: #1860585
This commit is contained in:
Alex Schultz 2020-01-22 10:39:05 -07:00
parent 58d7a5bc9d
commit 1e10b2294c
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/yum_install_buildah.yml
View File

@ -76,10 +76,12 @@
path: "{{ yum_install.path }}" path: "{{ yum_install.path }}"
state: absent state: absent
# NOTE(aschultz): remove --format docker when oci images are properly supported
- name: Commit changes to image - name: Commit changes to image
({{ target_image | default(source_image) }}{{ modified_append_tag }}) ({{ target_image | default(source_image) }}{{ modified_append_tag }})
command: > command: >
buildah commit buildah commit
--format docker
{{ from_image }} {{ from_image }}
{{ target_image | default(source_image) }}{{ modified_append_tag }} {{ target_image | default(source_image) }}{{ modified_append_tag }}

2
tasks/yum_update_buildah.yml
View File

@ -142,10 +142,12 @@
path: "{{ yum_update.path }}" path: "{{ yum_update.path }}"
state: absent state: absent
# NOTE(aschultz): remove --format docker when oci images are properly supported
- name: Commit changes to image - name: Commit changes to image
({{ target_image | default(source_image) }}{{ modified_append_tag }}) ({{ target_image | default(source_image) }}{{ modified_append_tag }})
command: > command: >
buildah commit buildah commit
--format docker
{{ from_image }} {{ from_image }}
{{ target_image | default(source_image) }}{{ modified_append_tag }} {{ target_image | default(source_image) }}{{ modified_append_tag }}

3
vars/main.yml
View File

@ -1,5 +1,6 @@
--- ---
# NOTE(aschultz): remove --format docker when oci images are properly supported
# we support 'docker' or 'buildah' # we support 'docker' or 'buildah'
build_commands: build_commands:
docker: docker build docker: docker build
buildah: buildah bud buildah: buildah bud --format docker