openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Revert "Preserve environment variables with buildah""

This commit is contained in:
Zuul 2022-12-19 11:56:02 +00:00 committed by Gerrit Code Review
parent 9e9da9ee03 8d2f7e7a42
commit 2eff2ca025
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/image/builder/buildah.py
View File

@ -94,7 +94,7 @@ class BuildahBuilder(base.BaseBuilder):
'Containerfile' in fnames}
# Building images with root so overlayfs is used, and not fuse-overlay
# from userspace, which would be slower.
self.buildah_cmd = ['sudo', '-E', 'buildah']
self.buildah_cmd = ['sudo', 'buildah']
if self.debug:
self.buildah_cmd.append('--log-level=debug')

2
tripleo_common/tests/image/builder/test_buildah.py
View File

@ -25,7 +25,7 @@ from tripleo_common.tests import base
from tripleo_common.utils import process
BUILDAH_CMD_BASE = ['sudo', '-E', 'buildah']
BUILDAH_CMD_BASE = ['sudo', 'buildah']
DEPS = {"base"}
WORK_DIR = '/tmp/kolla'
VOLS = ['/etc/pki:/etc/pki', '/etc/dir2:/dir2']