From b12c0def7d3c5bf19020500edfa27fa79cf9d03b Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 4 May 2020 12:44:04 -0400 Subject: [PATCH 1/2] Fix permissions for vendored collections in dev env --- tools/docker-compose/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 1f8b290e64..5f95f55408 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -128,8 +128,8 @@ ADD tools/docker-compose/entrypoint.sh / ADD tools/docker-compose/rsyslog.conf /var/lib/awx/rsyslog/rsyslog.conf ADD tools/scripts/awx-python /usr/bin/awx-python -# Pre-create things that we need to write to -RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/awx-rsyslog /var/log/tower/ /var/lib/awx/projects /.ansible /var/log/nginx /var/lib/nginx /.local; \ +# Pre-create things that we need to write to / fix up permissions +RUN for dir in /var/lib/awx /var/lib/awx/rsyslog /var/lib/awx/rsyslog/conf.d /var/run/awx-rsyslog /var/log/tower/ /var/lib/awx/projects /.ansible /var/log/nginx /var/lib/nginx /.local /vendor; \ do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done && \ \ for file in /etc/passwd /etc/supervisord.conf /venv/awx/lib/python3.6/site-packages/awx.egg-link /var/run/nginx.pid; \ From a98887deb0d881fa0b434d6aa3f0f79922a20203 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 4 May 2020 14:23:05 -0400 Subject: [PATCH 2/2] Update INVENTORY_COLLECTIONS_ROOT in dev env settings --- awx/settings/local_settings.py.docker_compose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose index 301b7a9dfe..b59a3217f2 100644 --- a/awx/settings/local_settings.py.docker_compose +++ b/awx/settings/local_settings.py.docker_compose @@ -53,7 +53,7 @@ if "pytest" in sys.modules: PROJECTS_ROOT = '/var/lib/awx/projects/' # Location for cross-development of inventory plugins -# INVENTORY_COLLECTIONS_ROOT = '/awx_devel/awx/plugins/collections' +INVENTORY_COLLECTIONS_ROOT = '/vendor/inventory_collections' # Absolute filesystem path to the directory for job status stdout # This directory should not be web-accessible