From 5575f381aabb19de76315a8a060825e5270f5ec0 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 22 Jan 2020 12:10:58 -0700 Subject: [PATCH] Force docker format Newer versions of buildah create OCI containers but the undercloud registry does not support the OCI container metadata format so these cannot be used with newer podman. For now this can be worked around by explicitly passing --format docker when running buildah build related commands. Change-Id: I25c7a239add99e2d4dac433794d6ca92a58942b6 Related-Bug: #1860585 (cherry picked from commit 39f0f369b947120ebc5faa80946621065d1fae10) --- tripleo_common/image/builder/buildah.py | 5 ++++- tripleo_common/tests/image/builder/test_buildah.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tripleo_common/image/builder/buildah.py b/tripleo_common/image/builder/buildah.py index 9818ffec7..12cb3a3f1 100644 --- a/tripleo_common/image/builder/buildah.py +++ b/tripleo_common/image/builder/buildah.py @@ -122,7 +122,10 @@ class BuildahBuilder(base.BaseBuilder): # TODO(emilien): Stop ignoring TLS. The deployer should either secure # the registry or add it to insecure_registries. logfile = container_build_path + '/' + container_name + '-build.log' - args = self.buildah_cmd + ['bud', '--tls-verify=False', '--logfile', + # TODO(aschultz): drop --format docker when oci format is properly + # supported by the undercloud registry + args = self.buildah_cmd + ['bud', '--format', 'docker', + '--tls-verify=False', '--logfile', logfile, '-t', destination, container_build_path] print("Building %s image with: %s" % (container_name, ' '.join(args))) diff --git a/tripleo_common/tests/image/builder/test_buildah.py b/tripleo_common/tests/image/builder/test_buildah.py index a277550f8..30beb2300 100644 --- a/tripleo_common/tests/image/builder/test_buildah.py +++ b/tripleo_common/tests/image/builder/test_buildah.py @@ -35,7 +35,8 @@ class TestBuildahBuilder(base.TestCase): dest = '127.0.0.1:8787/master/fedora-binary-fedora-base:latest' container_build_path = WORK_DIR + '/' + 'fedora-base' logfile = '/tmp/kolla/fedora-base/fedora-base-build.log' - buildah_cmd_build = ['bud', '--tls-verify=False', '--logfile', + buildah_cmd_build = ['bud', '--format', 'docker', + '--tls-verify=False', '--logfile', logfile, '-t', dest, container_build_path] args.extend(buildah_cmd_build) bb(WORK_DIR, DEPS).build('fedora-base', container_build_path)