journal-publisher: Update the journal publisher entrypoint

As the configuration is no longer implicit, add the missing bits and
pieces.

Related D1239
Related T1276

conf/journal_publisher.yml

@@ -2,13 +2,9 @@ brokers:
   - kafka
 
 temporary_prefix: swh.tmp.journal.new
-
-storage:
-  cls: remote
-  args:
-    url: http://swh-storage:5002/
-
-max_messages: 1
+final_prefix: swh.journal.objects
+consumer_id: swh.journal.publisher
+publisher_id: swh.journal.publisher
 
 object_types:
   - content
@@ -17,3 +13,10 @@ object_types:
   - origin
   - origin_visit
   - snapshot
+
+storage:
+  cls: remote
+  args:
+    url: http://swh-storage:5002/
+
+max_messages: 1

docker-compose.yml

@@ -330,11 +330,13 @@ services:
     image: swh/stack
     build: ./
     entrypoint: /swh-journal-publisher/entrypoint.sh
+    environment:
+      SWH_CONFIG_FILENAME: /journal_publisher.yml
     depends_on:
       - kafka
       - swh-storage-listener
     volumes:
-      - "./conf/journal_publisher.yml:/etc/softwareheritage/journal/publisher.yml:ro"
+      - "./conf/journal_publisher.yml:/journal_publisher.yml:ro"
 
   swh-journal-client:
     image: swh/stack

services/swh-journal-publisher/entrypoint.sh

@@ -18,7 +18,7 @@ case "$1" in
       exec bash -i
       ;;
     *)
-        echo "Starting swh-journal-publisher"
-        exec wait-for-it kafka:9092 -s --timeout=0 -- python3 -m swh.journal.publisher
+      echo "Starting swh-journal-publisher"
+      exec wait-for-it kafka:9092 -s --timeout=0 -- swh-journal publisher
       ;;
 esac

[Phabricator Migration user]

Some references in the commit message have been migrated:

• D1239 is now swh-journal!242 (closed)