Page MenuHomeSoftware Heritage
Files F7066599

D5002.diff
No OneTemporary
Actions

D5002.diff
View Options

diff --git a/docker/conf/lister.yml b/docker/conf/lister.yml
--- a/docker/conf/lister.yml
+++ b/docker/conf/lister.yml
@@ -1,16 +1,7 @@
-storage:
- cls: remote
- url: http://swh-storage:5002/
-
scheduler:
cls: remote
url: http://swh-scheduler:5008/
-lister:
- cls: local
- args:
- db: postgresql://postgres@swh-listers-db/swh-listers
-
celery:
task_broker: amqp://guest:guest@amqp//
task_queues:
@@ -34,7 +25,6 @@
- swh.lister.npm.tasks.NpmListerTask
- swh.lister.launchpad.tasks.IncrementalLaunchpadLister
- swh.lister.launchpad.tasks.FullLaunchpadLister
- - swh.lister.launchpad.tasks.NewLaunchpadLister
- swh.lister.packagist.tasks.PackagistListerTask
- swh.lister.phabricator.tasks.FullPhabricatorLister
- swh.lister.phabricator.tasks.IncrementalPhabricatorLister
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -314,17 +314,11 @@
# Lister Celery workers
- swh-listers-db:
- image: postgres:12
- env_file:
- - ./env/listers-db.env
-
swh-lister:
image: swh/stack
build: ./
env_file:
- ./env/common_python.env
- - ./env/listers-db.env
- ./env/listers.env
- ./env/workers.env
user: swh
@@ -332,10 +326,8 @@
SWH_WORKER_INSTANCE: listers
SWH_CONFIG_FILENAME: /lister.yml
depends_on:
- - swh-listers-db
- swh-scheduler
- swh-scheduler-runner
- - swh-storage
- amqp
entrypoint: /entrypoint.sh
volumes:
diff --git a/docker/env/listers-db.env b/docker/env/listers-db.env
deleted file mode 100644
--- a/docker/env/listers-db.env
+++ /dev/null
@@ -1,2 +0,0 @@
-POSTGRES_PASSWORD=testpassword
-POSTGRES_DB=swh-listers
diff --git a/docker/env/listers.env b/docker/env/listers.env
--- a/docker/env/listers.env
+++ b/docker/env/listers.env
@@ -1,2 +0,0 @@
-PGHOST=swh-listers-db
-PGUSER=postgres
diff --git a/docker/services/swh-listers-worker/entrypoint.sh b/docker/services/swh-listers-worker/entrypoint.sh
--- a/docker/services/swh-listers-worker/entrypoint.sh
+++ b/docker/services/swh-listers-worker/entrypoint.sh
@@ -5,20 +5,11 @@
source /srv/softwareheritage/utils/pyutils.sh
setup_pip
-source /srv/softwareheritage/utils/pgsql.sh
-setup_pgsql
-
case "$1" in
"shell")
exec bash -i
;;
*)
- wait_pgsql ${POSTGRES_DB}
-
- echo Setup ${POSTGRES_DB} database for ${SWH_WORKER_INSTANCE}
-
- echo Initialize database
- swh lister -C ${SWH_CONFIG_FILENAME} db-init
echo Register task types in scheduler database
wait-for-it swh-scheduler:5008 -s --timeout=0

File Metadata

Mime Type
text/plain
Expires
Nov 5 2024, 3:43 PM (18 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3220022

Event Timeline

About · Developer information · Legal