diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -80,7 +80,10 @@ - swh-storage (plugged to communicate with the objstorage and the db) +- swh-web (plugged to communicate with the previous services) + That means, you can start doing the ingestion using those services -using the same setup described in the getting-started [1]. +using the same setup described in the getting-started starting +directly at [1]. Yes, even browsing the web app! [1] https://docs.softwareheritage.org/devel/getting-started.html#step-4-ingest-repositories diff --git a/docker-compose.yml b/docker-compose.yml --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,3 +24,12 @@ image: swh/objstorage ports: - 5003:5003 + + swh-web: + build: ./dockerfiles/swh-web + image: swh/web + ports: + - 5004:5004 + depends_on: + - swh-objstorage + - swh-storage diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh --- a/dockerfiles/swh-storage/entrypoint.sh +++ b/dockerfiles/swh-storage/entrypoint.sh @@ -3,25 +3,33 @@ set -e if [[ -d /src ]] ; then - for srcrepo in /src/swh-* ; do - pushd $srcrepo - pip install -e . - popd - done + 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 <