Merge pull request ansible#4292 from shanemcd/fix-inventory-plugin-pe…

…rmissions

Fix permissions for vendored collections in dev env

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

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; \