diff --git a/deposit.env b/deposit.env new file mode 100644 index 0000000..bfd3b04 --- /dev/null +++ b/deposit.env @@ -0,0 +1,3 @@ +POSTGRES_DB=softwareheritage-deposit +POSTGRES_PASSWORD=testpassword +PGUSER=postgres diff --git a/docker-compose.yml b/docker-compose.yml index c942cc8..43c7be5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,258 +1,274 @@ version: '2' services: amqp: image: rabbitmq:3.6-management ports: - 5018:15672 zookeeper: image: wurstmeister/zookeeper ports: - "2181:2181" kafka: image: wurstmeister/kafka ports: - "9092:9092" env_file: ./kafka.env depends_on: - zookeeper # Scheduler swh-scheduler-db: image: postgres:10 environment: POSTGRES_PASSWORD: testpassword POSTGRES_DB: swh-scheduler swh-scheduler-api: image: swh/scheduler-api build: ./dockerfiles/swh-scheduler-api env_file: ./scheduler.env depends_on: - swh-scheduler-db ports: - 5008:5008 swh-scheduler-listener: image: swh/scheduler-worker build: ./dockerfiles/swh-scheduler-worker env_file: ./scheduler.env command: listener depends_on: - swh-scheduler-api - amqp swh-scheduler-runner: image: swh/scheduler-worker build: ./dockerfiles/swh-scheduler-worker env_file: ./scheduler.env command: runner depends_on: - swh-scheduler-api - amqp # Graph storage swh-storage-db: image: postgres:10 environment: POSTGRES_PASSWORD: testpassword POSTGRES_DB: swh-storage swh-storage: build: ./dockerfiles/swh-storage image: swh/storage ports: - 5002:5002 depends_on: - swh-storage-db - swh-objstorage env_file: ./storage.env # Object storage swh-objstorage: build: ./dockerfiles/swh-objstorage image: swh/objstorage ports: - 5003:5003 # Indexer storage swh-idx-storage-db: image: postgres:10 environment: POSTGRES_PASSWORD: testpassword POSTGRES_DB: swh-idx-storage swh-idx-storage: build: ./dockerfiles/swh-indexer-storage image: swh/indexer-storage ports: - 5007:5007 depends_on: - swh-idx-storage-db environment: POSTGRES_PASSWORD: testpassword POSTGRES_DB: swh-idx-storage PGHOST: swh-idx-storage-db PGUSER: postgres # Web interface swh-web: build: ./dockerfiles/swh-web image: swh/web ports: - 8080:5004 depends_on: - swh-objstorage - swh-storage - swh-idx-storage + swh-deposit-db: + image: postgres:10 + env_file: ./deposit.env + + swh-deposit: + build: ./dockerfiles/swh-deposit + image: swh/deposit + ports: + - 5006:5006 + depends_on: + - swh-deposit-db + - swh-scheduler-api + env_file: ./deposit.env + environment: + PGHOST: swh-deposit-db + # Lister Celery workers swh-listers-db: image: postgres:10 environment: POSTGRES_PASSWORD: testpassword swh-lister-debian: image: swh/listers-worker build: ./dockerfiles/swh-listers-worker env_file: ./listers.env environment: SWH_WORKER_INSTANCE: debian depends_on: - swh-listers-db - swh-scheduler-api - swh-storage - amqp swh-lister-github: image: swh/listers-worker build: ./dockerfiles/swh-listers-worker env_file: ./listers.env environment: SWH_WORKER_INSTANCE: github depends_on: - swh-listers-db - swh-scheduler-api - swh-storage - amqp swh-lister-gitlab: image: swh/listers-worker build: ./dockerfiles/swh-listers-worker env_file: ./listers.env environment: SWH_WORKER_INSTANCE: gitlab depends_on: - swh-listers-db - swh-scheduler-api - swh-storage - amqp swh-lister-npm: image: swh/listers-worker build: ./dockerfiles/swh-listers-worker env_file: ./listers.env environment: SWH_WORKER_INSTANCE: npm depends_on: - swh-listers-db - swh-scheduler-api - swh-storage - amqp swh-lister-pypi: image: swh/listers-worker build: ./dockerfiles/swh-listers-worker env_file: ./listers.env environment: SWH_WORKER_INSTANCE: pypi depends_on: - swh-listers-db - swh-scheduler-api - swh-storage - amqp # Indexer Celery workers swh-indexer-mimetype: image: swh/indexer-worker build: ./dockerfiles/swh-indexer-worker env_file: ./indexers.env environment: SWH_WORKER_INSTANCE: content_mimetype depends_on: - swh-scheduler-api - swh-idx-storage - swh-storage - swh-objstorage - amqp swh-indexer-origin-head: image: swh/indexer-worker build: ./dockerfiles/swh-indexer-worker env_file: ./indexers.env environment: SWH_WORKER_INSTANCE: origin_head depends_on: - swh-scheduler-api - swh-idx-storage - swh-storage - amqp swh-indexer-revision-metadata: image: swh/indexer-worker build: ./dockerfiles/swh-indexer-worker env_file: ./indexers.env environment: SWH_WORKER_INSTANCE: revision_metadata depends_on: - swh-scheduler-api - swh-idx-storage - swh-storage - swh-objstorage - amqp swh-indexer-origin-intrinsic-metadata: image: swh/indexer-worker build: ./dockerfiles/swh-indexer-worker env_file: ./indexers.env environment: SWH_WORKER_INSTANCE: origin_intrinsic_metadata depends_on: - swh-scheduler-api - swh-idx-storage - swh-storage - amqp # Journal related swh-storage-listener: image: swh/storage-listener build: ./dockerfiles/swh-storage-listener env_file: ./storage.env depends_on: - swh-storage-db - kafka swh-journal-publisher: image: swh/journal-publisher build: ./dockerfiles/swh-journal-publisher depends_on: - kafka - swh-storage-listener swh-journal-client: image: swh/journal-client build: ./dockerfiles/swh-journal-client depends_on: - swh-journal-publisher diff --git a/dockerfiles/swh-deposit/Dockerfile b/dockerfiles/swh-deposit/Dockerfile new file mode 100644 index 0000000..60837ff --- /dev/null +++ b/dockerfiles/swh-deposit/Dockerfile @@ -0,0 +1,16 @@ +FROM python:3 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && apt-get upgrade -y && \ + apt-get install -y libsystemd-dev postgresql-client && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +RUN pip install swh-deposit gunicorn +RUN pip install psycopg2-binary # to make pip silent +COPY server.yml /etc/softwareheritage/deposit/ +COPY private.yml /etc/softwareheritage/deposit/ + +COPY entrypoint.sh / +EXPOSE 5006 +ENTRYPOINT ["/entrypoint.sh"] diff --git a/dockerfiles/swh-deposit/entrypoint.sh b/dockerfiles/swh-deposit/entrypoint.sh new file mode 100755 index 0000000..82e2bae --- /dev/null +++ b/dockerfiles/swh-deposit/entrypoint.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -ex + +if [[ -d /src ]] ; then + pwd + for src_repo in /src/swh-* ; do + pushd $src_repo + echo "Installing ${src_repo}" + pip install -e . + popd + done +fi + +echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass +cat > ~/.pg_service.conf < /dev/null 2> /dev/null; do sleep 0.1; done + + echo "Migrating db" + django-admin migrate --settings=swh.deposit.settings.production + + echo "starting swh-deposit server" + exec gunicorn --bind 0.0.0.0:5006 \ + --reload \ + --log-level DEBUG \ + swh.deposit.wsgi +fi diff --git a/dockerfiles/swh-deposit/loader.yml b/dockerfiles/swh-deposit/loader.yml new file mode 100644 index 0000000..a97e7ce --- /dev/null +++ b/dockerfiles/swh-deposit/loader.yml @@ -0,0 +1 @@ +extraction_dir: /tmp/swh.deposit.loader/ diff --git a/dockerfiles/swh-deposit/private.yml b/dockerfiles/swh-deposit/private.yml new file mode 100644 index 0000000..e3180a3 --- /dev/null +++ b/dockerfiles/swh-deposit/private.yml @@ -0,0 +1,8 @@ +secret_key: prod-in-docker +db: + host: swh-deposit-db + port: 5432 + name: softwareheritage-deposit + user: postgres + password: testpassword +media_root: /tmp/swh-deposit/uploads diff --git a/dockerfiles/swh-deposit/server.yml b/dockerfiles/swh-deposit/server.yml new file mode 100644 index 0000000..8aeaacc --- /dev/null +++ b/dockerfiles/swh-deposit/server.yml @@ -0,0 +1,4 @@ +scheduler: + cls: remote + args: + url: http://swh-scheduler:5008