External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7184 from wenottingham/a-preview-of-whats-to-come

Browse Source 
Remove dev env futzing of supervisord.conf permissions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-06-04 21:47:02 +00:00
committed by GitHub
parent 8c51993278 131f5ff018
commit 4a5edf7b88
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -220,7 +220,6 @@ RUN for dir in \
/vendor ; \ /vendor ; \
do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \ do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \
for file in \ for file in \
/etc/supervisord.conf \
/var/run/nginx.pid \ /var/run/nginx.pid \
/venv/awx/lib/python3.6/site-packages/awx.egg-link ; \ /venv/awx/lib/python3.6/site-packages/awx.egg-link ; \
do touch $file ; chmod g+rw $file ; done do touch $file ; chmod g+rw $file ; done

3
tools/docker-compose-cluster.yml
View File

@@ -31,6 +31,7 @@ services:
- "../:/awx_devel" - "../:/awx_devel"
- "./redis/redis_socket_ha_1:/var/run/redis/" - "./redis/redis_socket_ha_1:/var/run/redis/"
- "./memcached/:/var/run/memcached" - "./memcached/:/var/run/memcached"
- "./docker-compose/supervisor.conf:/etc/supervisord.conf"
ports: ports:
- "5899-5999:5899-5999" - "5899-5999:5899-5999"
awx-2: awx-2:
@@ -50,6 +51,7 @@ services:
- "../:/awx_devel" - "../:/awx_devel"
- "./redis/redis_socket_ha_2:/var/run/redis/" - "./redis/redis_socket_ha_2:/var/run/redis/"
- "./memcached/:/var/run/memcached" - "./memcached/:/var/run/memcached"
- "./docker-compose/supervisor.conf:/etc/supervisord.conf"
ports: ports:
- "7899-7999:7899-7999" - "7899-7999:7899-7999"
awx-3: awx-3:
@@ -69,6 +71,7 @@ services:
- "../:/awx_devel" - "../:/awx_devel"
- "./redis/redis_socket_ha_3:/var/run/redis/" - "./redis/redis_socket_ha_3:/var/run/redis/"
- "./memcached/:/var/run/memcached" - "./memcached/:/var/run/memcached"
- "./docker-compose/supervisor.conf:/etc/supervisord.conf"
ports: ports:
- "8899-8999:8899-8999" - "8899-8999:8899-8999"
redis_1: redis_1:

1
tools/docker-compose.yml
View File

@@ -35,6 +35,7 @@ services:
- "./redis/redis_socket_standalone:/var/run/redis/" - "./redis/redis_socket_standalone:/var/run/redis/"
- "./memcached/:/var/run/memcached" - "./memcached/:/var/run/memcached"
- "./rsyslog/:/var/lib/awx/rsyslog" - "./rsyslog/:/var/lib/awx/rsyslog"
- "./docker-compose/supervisor.conf:/etc/supervisord.conf"
privileged: true privileged: true
tty: true tty: true
# A useful container that simply passes through log messages to the console # A useful container that simply passes through log messages to the console

1
tools/docker-compose/bootstrap_development.sh
View File

@@ -20,7 +20,6 @@ else
fi fi
make awx-link make awx-link
yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /etc/supervisord.conf
# AWX bootstrapping # AWX bootstrapping
make version_file make version_file