From fe0db4e32962ec23054a4c017eb79ff35c81ade7 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 12 Sep 2019 15:22:16 -0400 Subject: [PATCH] Consolidate scl enable calls --- Makefile | 16 ++++++++-------- tools/docker-compose/start_tests.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 51117a65be..7e8c6362df 100644 --- a/Makefile +++ b/Makefile @@ -272,31 +272,31 @@ supervisor: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 'supervisord --pidfile=/tmp/supervisor_pid -n' + supervisord --pidfile=/tmp/supervisor_pid -n collectstatic: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 'mkdir -p awx/public/static && $(PYTHON) manage.py collectstatic --clear --noinput > /dev/null 2>&1' + mkdir -p awx/public/static && $(PYTHON) manage.py collectstatic --clear --noinput > /dev/null 2>&1 uwsgi: collectstatic @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 'uwsgi -b 32768 --socket 127.0.0.1:8050 --module=awx.wsgi:application --home=/venv/awx --chdir=/awx_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --lazy-apps --logformat "%(addr) %(method) %(uri) - %(proto) %(status)" --hook-accepting1="exec:supervisorctl restart tower-processes:awx-dispatcher tower-processes:awx-receiver"' + uwsgi -b 32768 --socket 127.0.0.1:8050 --module=awx.wsgi:application --home=/venv/awx --chdir=/awx_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --lazy-apps --logformat "%(addr) %(method) %(uri) - %(proto) %(status)" --hook-accepting1="exec:supervisorctl restart tower-processes:awx-dispatcher tower-processes:awx-receiver" daphne: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 'daphne -b 127.0.0.1 -p 8051 awx.asgi:channel_layer' + daphne -b 127.0.0.1 -p 8051 awx.asgi:channel_layer runworker: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 '$(PYTHON) manage.py runworker --only-channels websocket.*' + $(PYTHON) manage.py runworker --only-channels websocket.* # Run the built-in development webserver (by default on http://localhost:8013). runserver: @@ -310,7 +310,7 @@ dispatcher: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 '$(PYTHON) manage.py run_dispatcher' + $(PYTHON) manage.py run_dispatcher # Run to start the zeromq callback receiver @@ -318,7 +318,7 @@ receiver: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 '$(PYTHON) manage.py run_callback_receiver' + $(PYTHON) manage.py run_callback_receiver nginx: nginx -g "daemon off;" @@ -327,7 +327,7 @@ jupyter: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - /usr/bin/scl enable rh-postgresql10 '$(MANAGEMENT_COMMAND) shell_plus --notebook' + $(MANAGEMENT_COMMAND) shell_plus --notebook reports: mkdir -p $@ 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}"