From 7eb483d810f853ee2e92f4acb1798c1351847337 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Fri, 8 Mar 2019 15:20:50 +0100 Subject: [PATCH] bwrap: Add /etc/ssh in bind mounted folder /etc/ssh is currently not bound when run into bwrap, this leads to error like "Bad owner or permissions on /etc/ssh/ssh_config.d/05-redhat.conf" since it cannot access this file. --- awx/main/utils/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 60306ea8e6..fa225fb36e 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -831,7 +831,7 @@ def wrap_args_with_proot(args, cwd, **kwargs): new_args = [getattr(settings, 'AWX_PROOT_CMD', 'bwrap'), '--unshare-pid', '--dev-bind', '/', '/', '--proc', '/proc'] hide_paths = [settings.AWX_PROOT_BASE_PATH] if not kwargs.get('isolated'): - hide_paths.extend(['/etc/tower', '/var/lib/awx', '/var/log', + hide_paths.extend(['/etc/tower', '/var/lib/awx', '/var/log', '/etc/ssh', settings.PROJECTS_ROOT, settings.JOBOUTPUT_ROOT]) hide_paths.extend(getattr(settings, 'AWX_PROOT_HIDE_PATHS', None) or []) for path in sorted(set(hide_paths)):