diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh index 3296e6a..50189f6 100755 --- a/dockerfiles/swh-indexer-storage/entrypoint.sh +++ b/dockerfiles/swh-indexer-storage/entrypoint.sh @@ -1,42 +1,45 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo echo "WARNING: $srcrepo will NOT be pip installed in dev mode" echo " due to permission limitations." pip install --user . popd done fi +echo Installed Python packages: +pip list + echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass cat > ~/.pg_service.conf <&1 > /dev/null; do sleep 0.1; done echo Setup the database PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init indexer \ --db-name ${POSTGRES_DB} echo Starting the swh-indexer-storage API server exec python -m swh.indexer.storage.api.server /indexer_storage ;; esac diff --git a/dockerfiles/swh-journal-client/entrypoint.sh b/dockerfiles/swh-journal-client/entrypoint.sh index 8784ae7..ec37f81 100755 --- a/dockerfiles/swh-journal-client/entrypoint.sh +++ b/dockerfiles/swh-journal-client/entrypoint.sh @@ -1,21 +1,24 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo pip install -e . popd done fi +echo Installed Python packages: +pip list + case "$1" in "shell") exec bash -i ;; *) echo "Starting an swh-journal client" exec python3 -m client ;; esac diff --git a/dockerfiles/swh-journal-publisher/entrypoint.sh b/dockerfiles/swh-journal-publisher/entrypoint.sh index 057acca..088d95f 100755 --- a/dockerfiles/swh-journal-publisher/entrypoint.sh +++ b/dockerfiles/swh-journal-publisher/entrypoint.sh @@ -1,21 +1,24 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo pip install -e . popd done fi +echo Installed Python packages: +pip list + case "$1" in "shell") exec bash -i ;; *) echo "Starting swh-journal publisher" exec python3 -m swh.journal.publisher --verbose ;; esac diff --git a/dockerfiles/swh-listers-worker/entrypoint.sh b/dockerfiles/swh-listers-worker/entrypoint.sh index 28ce99a..52c9f9e 100755 --- a/dockerfiles/swh-listers-worker/entrypoint.sh +++ b/dockerfiles/swh-listers-worker/entrypoint.sh @@ -1,69 +1,72 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo echo "WARNING: $srcrepo wil NOT be pip installed in dev mode" echo " due to permission limitations." pip install --user . popd done fi +echo Installed Python packages: +pip list + export POSTGRES_DB=swh-lister-${SWH_WORKER_INSTANCE} echo "${PGHOST}:5432:postgres:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" >> ~/.pgpass cat > ~/.pg_service.conf < ~/.config/swh/worker/${SWH_WORKER_INSTANCE}.ini < ~/.pgpass cat > ~/.pg_service.conf <&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} 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 bdcfdca..bb0abf0 100755 --- a/dockerfiles/swh-scheduler-worker/entrypoint.sh +++ b/dockerfiles/swh-scheduler-worker/entrypoint.sh @@ -1,44 +1,47 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo pip install -e . popd done fi +echo Installed Python packages: +pip list + echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass cat > ~/.pg_service.conf < ~/.pgpass cat > ~/.pg_service.conf <&2 >/dev/null; do sleep 0.1; done echo "Starting swh-storage's listener" exec python3 -m swh.storage.listener --verbose ;; esac diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh index 3db7946..988a4b0 100755 --- a/dockerfiles/swh-storage/entrypoint.sh +++ b/dockerfiles/swh-storage/entrypoint.sh @@ -1,39 +1,42 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do pushd $srcrepo pip install -e . popd done fi +echo Installed Python packages: +pip list + echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass cat > ~/.pg_service.conf < /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 b8df845..34ff5a4 100755 --- a/dockerfiles/swh-web/entrypoint.sh +++ b/dockerfiles/swh-web/entrypoint.sh @@ -1,25 +1,28 @@ #!/bin/bash set -e if [[ -d /src ]] ; then for srcrepo in /src/swh-* ; do echo installing $srcrepo pip install -e . popd done fi +echo Installed Python packages: +pip list + 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 fi