From 81f6d36a3a36615a84544de8dba11cd10358eaed Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 17 Nov 2020 13:40:45 -0500 Subject: [PATCH] Set SDB_NOTIFY_HOST for all processes --- awx/settings/development.py | 9 --------- tools/docker-compose/entrypoint.sh | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/awx/settings/development.py b/awx/settings/development.py index 6181d16ec6..d181ca10fc 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -177,15 +177,6 @@ CELERYBEAT_SCHEDULE.update({ # noqa CLUSTER_HOST_ID = socket.gethostname() - -if 'Docker Desktop' in os.getenv('OS', ''): - os.environ['SDB_NOTIFY_HOST'] = 'docker.for.mac.host.internal' -else: - try: - os.environ['SDB_NOTIFY_HOST'] = os.popen('ip route').read().split(' ')[2] - except Exception: - pass - AWX_CALLBACK_PROFILE = True if 'sqlite3' not in DATABASES['default']['ENGINE']: # noqa diff --git a/tools/docker-compose/entrypoint.sh b/tools/docker-compose/entrypoint.sh index 13c858b441..c155f022e4 100755 --- a/tools/docker-compose/entrypoint.sh +++ b/tools/docker-compose/entrypoint.sh @@ -21,4 +21,10 @@ fi # writing out the sub*id files above podman system migrate +if [[ "$OS" == *"Docker Desktop"* ]]; then + export SDB_NOTIFY_HOST='docker.for.mac.host.internal' +else + export SDB_NOTIFY_HOST=$(ip route | head -n1 | awk '{print $3}') +fi + exec $@