From 804ec0dde937a78ba74af75ef1bd421f5c50a563 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 12 Sep 2019 13:53:46 -0400 Subject: [PATCH] Handle SCL enable in one place --- tools/docker-compose/entrypoint.sh | 2 +- tools/docker-compose/start_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker-compose/entrypoint.sh b/tools/docker-compose/entrypoint.sh index 8ed9bf2abd..996a7c7ef4 100755 --- a/tools/docker-compose/entrypoint.sh +++ b/tools/docker-compose/entrypoint.sh @@ -11,4 +11,4 @@ EOF rm /tmp/passwd fi -exec $@ +exec scl enable rh-postgresql10 "$@" diff --git a/tools/docker-compose/start_tests.sh b/tools/docker-compose/start_tests.sh index e1f8c61adc..a33d9a672f 100755 --- a/tools/docker-compose/start_tests.sh +++ b/tools/docker-compose/start_tests.sh @@ -8,4 +8,4 @@ sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-IN cp /tmp/awx.egg-link /venv/awx/lib/python3.6/site-packages/awx.egg-link cp awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py -scl enable rh-postgresql10 "make \"${1:-test}\"" +make "${1:-test}"