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

Fix dev environment when running as root on the host

Browse Source 
Without this, CURRENT_UID isnt actually passed in from the host, and wipes out /etc/passwd even when we’re actually running as root.

I tested this as a non-root user on Linux, and on Docker for Mac
This commit is contained in:
Shane McDonald
2019-03-06 17:08:56 -05:00
parent 658bdddac3
commit b29a9cd86e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ services:
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
hostname: awx_1 hostname: awx_1
environment: environment:
CURRENT_UID:
RABBITMQ_HOST: rabbitmq_1 RABBITMQ_HOST: rabbitmq_1
RABBITMQ_USER: guest RABBITMQ_USER: guest
RABBITMQ_PASS: guest RABBITMQ_PASS: guest
@@ -39,6 +40,7 @@ services:
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
hostname: awx_2 hostname: awx_2
environment: environment:
CURRENT_UID:
RABBITMQ_HOST: rabbitmq_2 RABBITMQ_HOST: rabbitmq_2
RABBITMQ_USER: guest RABBITMQ_USER: guest
RABBITMQ_PASS: guest RABBITMQ_PASS: guest
@@ -57,6 +59,7 @@ services:
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
hostname: awx_3 hostname: awx_3
environment: environment:
CURRENT_UID:
RABBITMQ_HOST: rabbitmq_3 RABBITMQ_HOST: rabbitmq_3
RABBITMQ_USER: guest RABBITMQ_USER: guest
RABBITMQ_PASS: guest RABBITMQ_PASS: guest

1
tools/docker-compose.yml
View File

@@ -7,6 +7,7 @@ services:
container_name: tools_awx_1 container_name: tools_awx_1
hostname: awx hostname: awx
environment: environment:
CURRENT_UID:
RABBITMQ_HOST: rabbitmq RABBITMQ_HOST: rabbitmq
RABBITMQ_USER: guest RABBITMQ_USER: guest
RABBITMQ_PASS: guest RABBITMQ_PASS: guest