diff options
| author | Shane McDonald <me@shanemcd.com> | 2021-07-22 19:54:31 +0200 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2021-07-22 19:56:58 +0200 |
| commit | 0aca4d658af70fd718b3aac8fbb654c18d540aa3 (patch) | |
| tree | 7337ac2739b14fdf9679f9d9133f4142ad5cfcaf /tools/ansible/roles/dockerfile/files | |
| parent | Merge pull request #10425 from sarabrajsingh/bugfix/preflight-check-postgres-... (diff) | |
| download | awx-0aca4d658af70fd718b3aac8fbb654c18d540aa3.tar.xz awx-0aca4d658af70fd718b3aac8fbb654c18d540aa3.zip | |
Bash nitpick
Diffstat (limited to 'tools/ansible/roles/dockerfile/files')
| -rwxr-xr-x | tools/ansible/roles/dockerfile/files/launch_awx.sh | 4 | ||||
| -rwxr-xr-x | tools/ansible/roles/dockerfile/files/launch_awx_task.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/ansible/roles/dockerfile/files/launch_awx.sh b/tools/ansible/roles/dockerfile/files/launch_awx.sh index ce90142cb4..ac5a204d65 100755 --- a/tools/ansible/roles/dockerfile/files/launch_awx.sh +++ b/tools/ansible/roles/dockerfile/files/launch_awx.sh @@ -13,7 +13,9 @@ if [ -n "${AWX_KUBE_DEVEL}" ]; then export SDB_NOTIFY_HOST=$MY_POD_IP fi -wait-for-migrations || exit 1 +set -e + +wait-for-migrations awx-manage collectstatic --noinput --clear diff --git a/tools/ansible/roles/dockerfile/files/launch_awx_task.sh b/tools/ansible/roles/dockerfile/files/launch_awx_task.sh index 2e0d1a9b10..ae1a87a6b0 100755 --- a/tools/ansible/roles/dockerfile/files/launch_awx_task.sh +++ b/tools/ansible/roles/dockerfile/files/launch_awx_task.sh @@ -13,6 +13,8 @@ if [ -n "${AWX_KUBE_DEVEL}" ]; then export SDB_NOTIFY_HOST=$MY_POD_IP fi -wait-for-migrations || exit 1 +set -e + +wait-for-migrations supervisord -c /etc/supervisord_task.conf |