External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2667 from saito-hideki/issue/admin_with_docker-compose

Browse Source 
Fixed issue where admin_user and password change are not reflected

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-15 14:24:43 +00:00 committed by GitHub
commit 1833a5b78b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/roles/local_docker/templates/docker-compose.yml.j2
View File

@ -59,8 +59,8 @@ services:
RABBITMQ_VHOST: awx
MEMCACHED_HOST: memcached
MEMCACHED_PORT: 11211
AWX_ADMIN_USER: {{ default_admin_user|default('admin') }}
AWX_ADMIN_PASSWORD: {{ default_admin_password|default('password') }}
AWX_ADMIN_USER: {{ admin_user|default('admin') }}
AWX_ADMIN_PASSWORD: {{ admin_password|default('password') }}
task:
image: {{ awx_task_docker_actual_image }}
@ -118,8 +118,8 @@ services:
RABBITMQ_VHOST: awx
MEMCACHED_HOST: memcached
MEMCACHED_PORT: 11211
AWX_ADMIN_USER: {{ default_admin_user|default('admin') }}
AWX_ADMIN_PASSWORD: {{ default_admin_password|default('password') }}
AWX_ADMIN_USER: {{ admin_user|default('admin') }}
AWX_ADMIN_PASSWORD: {{ admin_password|default('password') }}
rabbitmq:
image: {{ rabbitmq_image }}