diff options
| author | Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> | 2024-07-22 22:48:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-22 22:48:53 +0200 |
| commit | 7691365aea2eb3cafaf658f361394837b3595ec5 (patch) | |
| tree | 38ff42035136692e04bed11980632f71392f5bb7 /tools | |
| parent | Loosen up team EE restrictions (#15384) (diff) | |
| download | awx-7691365aea2eb3cafaf658f361394837b3595ec5.tar.xz awx-7691365aea2eb3cafaf658f361394837b3595ec5.zip | |
Fix depends_on for awx devel when editable dependencies is enabled (#15393)
Fix depends_on for awx devel...
when editable dependencies is on
bug introduced by https://github.com/ansible/awx/pull/15386
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index d8ae1b770e..a56f861fda 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -47,9 +47,6 @@ services: {% if minikube_container_group|bool %} MINIKUBE_CONTAINER_GROUP: "true" {% endif %} - depends_on: - - postgres - - redis_{{ container_postfix }} networks: - awx - service-mesh @@ -80,8 +77,12 @@ services: - "~/.kube/config:/var/lib/awx/.kube/config" - "redis_socket_{{ container_postfix }}:/var/run/redis/:rw" privileged: true -{% if editable_dependencies | length > 0 %} depends_on: + postgres: + condition: service_started + redis_{{ container_postfix }}: + condition: service_started +{% if editable_dependencies | length > 0 %} init_awx: condition: service_completed_successfully {% endif %} |