Browse Source

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
changes/46/703846/1
Alex Schultz 4 weeks ago
parent
commit
1e10b2294c
3 changed files with 6 additions and 1 deletions
  1. +2
    -0
      tasks/yum_install_buildah.yml
  2. +2
    -0
      tasks/yum_update_buildah.yml
  3. +2
    -1
      vars/main.yml

+ 2
- 0
tasks/yum_install_buildah.yml View File

@@ -76,10 +76,12 @@
path: "{{ yum_install.path }}"
state: absent

# NOTE(aschultz): remove --format docker when oci images are properly supported
- name: Commit changes to image
({{ target_image | default(source_image) }}{{ modified_append_tag }})
command: >
buildah commit
--format docker
{{ from_image }}
{{ target_image | default(source_image) }}{{ modified_append_tag }}


+ 2
- 0
tasks/yum_update_buildah.yml View File

@@ -142,10 +142,12 @@
path: "{{ yum_update.path }}"
state: absent

# NOTE(aschultz): remove --format docker when oci images are properly supported
- name: Commit changes to image
({{ target_image | default(source_image) }}{{ modified_append_tag }})
command: >
buildah commit
--format docker
{{ from_image }}
{{ target_image | default(source_image) }}{{ modified_append_tag }}


+ 2
- 1
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'
build_commands:
docker: docker build
buildah: buildah bud
buildah: buildah bud --format docker

Loading…
Cancel
Save