diff --git a/dockerfiles/swh-scheduler-api/entrypoint.sh b/dockerfiles/swh-scheduler-api/entrypoint.sh index 4b9fd16..2e535f9 100755 --- a/dockerfiles/swh-scheduler-api/entrypoint.sh +++ b/dockerfiles/swh-scheduler-api/entrypoint.sh @@ -1,38 +1,38 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo pip install -e . popd done fi echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass cat > ~/.pg_service.conf <&1 > /dev/null; do sleep 0.1; done + echo Waiting for postgresql to start + until psql service=swh-scheduler -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done echo Setup the swh-scheduler API database PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init scheduler \ - --db-name ${POSTGRES_DB} + --db-name ${POSTGRES_DB} echo Starting the swh-scheduler API server exec python -m swh.scheduler.api.server /scheduler.yml esac diff --git a/dockerfiles/swh-scheduler-worker/entrypoint.sh b/dockerfiles/swh-scheduler-worker/entrypoint.sh index 7937f2a..6972bdc 100755 --- a/dockerfiles/swh-scheduler-worker/entrypoint.sh +++ b/dockerfiles/swh-scheduler-worker/entrypoint.sh @@ -1,44 +1,44 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo pip install -e . popd done fi echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass cat > ~/.pg_service.conf < ~/.pgpass cat > ~/.pg_service.conf < /dev/null 2> /dev/null; do sleep 0.1; done + echo Waiting for postgresql to start + until psql service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done echo Setup the database PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \ --db-name ${POSTGRES_DB} echo Starting the swh-storage API server exec python -m swh.storage.api.server /storage.yml - ;; + ;; esac diff --git a/dockerfiles/swh-web/entrypoint.sh b/dockerfiles/swh-web/entrypoint.sh index 5988ffd..b8df845 100755 --- a/dockerfiles/swh-web/entrypoint.sh +++ b/dockerfiles/swh-web/entrypoint.sh @@ -1,25 +1,25 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do echo installing $srcrepo pip install -e . popd done fi if [ "$1" = 'shell' ] ; then exec bash -i else echo "starting the swh-web server" # options: # --verbosity to have sensible output # --insecure to serve the static css/js # 0.0.0.0 so that we can actually reach the service. exec python3 -m swh.web.manage runserver \ - --verbosity 3 \ - --insecure \ - 0.0.0.0:5004 + --verbosity 3 \ + --insecure \ + 0.0.0.0:5004 fi