diff --git a/tripleo_common/image/builder/buildah.py b/tripleo_common/image/builder/buildah.py index ebfe30447..07d9db547 100644 --- a/tripleo_common/image/builder/buildah.py +++ b/tripleo_common/image/builder/buildah.py @@ -166,7 +166,7 @@ class BuildahBuilder(base.BaseBuilder): # TODO(aschultz): drop --format docker when oci format is properly # supported by the undercloud registry bud_args.extend(['--format', 'docker', '--tls-verify=False', - '--layers', '--logfile', logfile, '-t', + '--logfile', logfile, '-t', self._get_destination(container_name), container_build_path]) args = self.buildah_cmd + bud_args diff --git a/tripleo_common/tests/image/builder/test_buildah.py b/tripleo_common/tests/image/builder/test_buildah.py index 631a488d0..2d547413b 100644 --- a/tripleo_common/tests/image/builder/test_buildah.py +++ b/tripleo_common/tests/image/builder/test_buildah.py @@ -111,7 +111,7 @@ class TestBuildahBuilder(base.TestCase): container_build_path = WORK_DIR + '/' + 'fedora-base' logfile = '/tmp/kolla/fedora-base/fedora-base-build.log' buildah_cmd_build = ['--log-level debug', 'bud', '--format', 'docker', - '--tls-verify=False', '--layers', '--logfile', + '--tls-verify=False', '--logfile', logfile, '-t', dest, container_build_path] args.extend(buildah_cmd_build) bb(WORK_DIR, DEPS, debug=True).build('fedora-base', @@ -131,7 +131,7 @@ class TestBuildahBuilder(base.TestCase): container_build_path = WORK_DIR + '/' + 'fedora-base' logfile = '/tmp/kolla/fedora-base/fedora-base-build.log' buildah_cmd_build = ['bud', '--format', 'docker', - '--tls-verify=False', '--layers', + '--tls-verify=False', '--logfile', logfile, '-t', dest, container_build_path] args.extend(buildah_cmd_build) @@ -154,7 +154,7 @@ class TestBuildahBuilder(base.TestCase): buildah_cmd_build = ['bud', '--volume', '/etc/pki:/etc/pki', '--volume', '/etc/dir2:/dir2', '--format', 'docker', - '--tls-verify=False', '--layers', + '--tls-verify=False', '--logfile', logfile, '-t', dest, container_build_path] args.extend(buildah_cmd_build)