diff options
| author | Shane McDonald <me@shanemcd.com> | 2019-03-27 17:01:10 +0100 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2019-03-27 18:06:55 +0100 |
| commit | c3ba851908ab397857aeb6c5f0c0ea16c1f4ee5e (patch) | |
| tree | 08aea5956d3a9c1e389bcbad9f6347f0bad82184 /installer/roles/local_docker/templates | |
| parent | Merge pull request #3515 from shanemcd/docker-compose-permissions (diff) | |
| download | awx-c3ba851908ab397857aeb6c5f0c0ea16c1f4ee5e.tar.xz awx-c3ba851908ab397857aeb6c5f0c0ea16c1f4ee5e.zip | |
Fix docker-compose installs
In a series of unfortunate events, my patch yesterday didnt actually work. This fixes that.
Diffstat (limited to 'installer/roles/local_docker/templates')
| -rw-r--r-- | installer/roles/local_docker/templates/credentials.py.j2 | 3 | ||||
| -rw-r--r-- | installer/roles/local_docker/templates/docker-compose.yml.j2 | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/installer/roles/local_docker/templates/credentials.py.j2 b/installer/roles/local_docker/templates/credentials.py.j2 index 70c3f64bfa..b7907fa462 100644 --- a/installer/roles/local_docker/templates/credentials.py.j2 +++ b/installer/roles/local_docker/templates/credentials.py.j2 @@ -12,9 +12,10 @@ DATABASES = { BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( "{{ rabbitmq_user }}", "{{ rabbitmq_password }}", - "localhost", + "rabbitmq", "5672", "awx") + CHANNEL_LAYERS = { 'default': {'BACKEND': 'asgi_amqp.AMQPChannelLayer', 'ROUTING': 'awx.main.routing.channel_routing', diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index 29354dafe5..138d0e9871 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -4,6 +4,7 @@ services: web: image: {{ awx_web_docker_actual_image }} + container_name: awx_web depends_on: - rabbitmq - memcached @@ -50,6 +51,7 @@ services: task: image: {{ awx_task_docker_actual_image }} + container_name: awx_task depends_on: - rabbitmq - memcached @@ -95,18 +97,23 @@ services: rabbitmq: image: {{ rabbitmq_image }} + container_name: awx_rabbitmq restart: unless-stopped environment: - RABBITMQ_DEFAULT_VHOST: awx - RABBITMQ_ERLANG_COOKIE: cookiemonster + RABBITMQ_DEFAULT_VHOST: "{{ rabbitmq_default_vhost }}" + RABBITMQ_DEFAULT_USER: "{{ rabbitmq_user }}" + RABBITMQ_DEFAULT_PASS: "{{ rabbitmq_password }}" + RABBITMQ_ERLANG_COOKIE: {{ rabbitmq_erlang_cookie }} memcached: image: memcached:alpine + container_name: awx_memcached restart: unless-stopped {% if pg_hostname is not defined %} postgres: image: postgres:9.6 + container_name: awx_postgres restart: unless-stopped volumes: - {{ postgres_data_dir }}:/var/lib/postgresql/data:Z |