Update wait-for-it.sh for busybox fixes #45
This commit is contained in:
Родитель
2084700786
Коммит
e6f8c82702
2
Makefile
2
Makefile
|
@ -11,7 +11,7 @@ up: compose_build
|
|||
docker-compose up
|
||||
|
||||
test: compose_build
|
||||
docker-compose run app sh -c "/app/bin/wait-for-it.sh db:5432;coverage run manage.py test;coverage report -m --fail-under=100"
|
||||
docker-compose run app sh -c "/app/bin/wait-for-it.sh db:5432 -- coverage run manage.py test;coverage report -m --fail-under=100"
|
||||
|
||||
lint: compose_build
|
||||
docker-compose run app flake8 .
|
||||
|
|
|
@ -48,9 +48,9 @@ wait_for_wrapper()
|
|||
{
|
||||
# In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
|
||||
if [[ $QUIET -eq 1 ]]; then
|
||||
timeout $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
|
||||
timeout -t $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
|
||||
else
|
||||
timeout $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
|
||||
timeout -t $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
|
||||
fi
|
||||
PID=$!
|
||||
trap "kill -INT -$PID" INT
|
||||
|
|
Загрузка…
Ссылка в новой задаче