From d3b40b88ea0ea1759ab3e90034ce9b16392fd2fd Mon Sep 17 00:00:00 2001 From: Riad Abdallah Date: Thu, 3 Oct 2024 16:40:08 +0200 Subject: [PATCH] Remove individual streams from docker compose configs --- docker-compose.dev.yml | 14 +--- docker-compose.yml | 157 +---------------------------------------- 2 files changed, 4 insertions(+), 167 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3a59abd..e0218de 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -46,9 +46,9 @@ services: restart: "no" adressenregister: restart: "no" - frontend: - image: lblod/frontend-organization-portal:latest - restart: "no" + frontend: + image: lblod/frontend-organization-portal:latest + restart: "no" uri-info: restart: "no" delta-producer-background-jobs-initiator: @@ -75,14 +75,6 @@ services: restart: "no" construct-organization-relationships: restart: "no" - delta-producer-bg-jobs-initiator-worship-posts: - restart: "no" - delta-producer-pub-graph-maintainer-worship-posts: - restart: "no" - delta-producer-bg-jobs-initiator-public: - restart: "no" - delta-producer-pub-graph-maintainer-public: - restart: "no" mandatarissen-consumer: restart: "no" leidinggevenden-consumer: diff --git a/docker-compose.yml b/docker-compose.yml index ec24309..a185621 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -344,7 +344,7 @@ services: restart: always logging: *default-logging delta-producer-publication-graph-maintainer: - image: lblod/delta-producer-publication-graph-maintainer:1.1.1-rc.1 + image: lblod/delta-producer-publication-graph-maintainer:1.2.2 environment: MAX_BODY_SIZE: "50mb" PRETTY_PRINT_DIFF_JSON: "true" @@ -363,161 +363,6 @@ services: restart: always logging: *default-logging - ################################################################################ - # DELTA ORGANIZATIONS PUBLIC INFO: START - ################################################################################ - delta-producer-bg-jobs-initiator-organizations-public-info: - image: lblod/delta-producer-background-jobs-initiator:0.3.1 - environment: - JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs" - DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations-public-info" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations-public-info" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations-public-info" - CRON_PATTERN_DUMP_JOB: "27 */4 * * *" # At minute 27 every 4 hours - CRON_PATTERN_HEALING_JOB: "0 0 4 * * *" # everyday at 4 AM - START_INITIAL_SYNC: "false" # Enable in override when ready to initial sync - labels: - - "logging=true" - links: - - db:database - restart: always - logging: *default-logging - delta-producer-pub-graph-maintainer-organizations-public-info: - image: lblod/delta-producer-publication-graph-maintainer:0.15.5 - environment: - MAX_BODY_SIZE: "50mb" - JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs" - RELATIVE_FILE_PATH: "deltas/organizations-public-info" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/organizations-public-info" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations-public-info" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations-public-info" - QUEUE_POLL_INTERVAL: 3000 - USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive - SKIP_MU_AUTH_INITIAL_SYNC: "true" - HEALING_PATCH_GRAPH_BATCH_SIZE: 500 - SERVE_DELTA_FILES: "true" - PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations-public-info" - DELTA_INTERVAL_MS: 10000 - PRETTY_PRINT_DIFF_JSON: "true" - PUBLICATION_VIRTUOSO_ENDPOINT: "http://publication-triplestore:8890/sparql" - PUBLICATION_MU_AUTH_ENDPOINT: "http://publication-triplestore:8890/sparql" - ERROR_GRAPH: "http://mu.semte.ch/graphs/jobs" - volumes: - - ./config/delta-producer/organizations-public-info:/config - - ./data/files/:/share - links: - - db:database - - triplestore:virtuoso - restart: always - labels: - - "logging=true" - logging: *default-logging - ################################################################################ - # DELTA ORGANIZATIONS PUBLIC INFO: END - ################################################################################ - - ################################################################################ - # DELTA PUBLIC INFORMATION: START - ################################################################################ - delta-producer-bg-jobs-initiator-public: - image: lblod/delta-producer-background-jobs-initiator:0.3.1 - environment: - JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs" - DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/public" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/public" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/public" - CRON_PATTERN_DUMP_JOB: "11 */4 * * *" # At minute 11 every 4 hours - CRON_PATTERN_HEALING_JOB: "0 0 4 * * *" # everyday at 4 AM - START_INITIAL_SYNC: "false" # prefer to disable it now. We want to have feeling with how the DB acts. - labels: - - "logging=true" - links: - - db:database - restart: always - logging: *default-logging - delta-producer-pub-graph-maintainer-public: - image: lblod/delta-producer-publication-graph-maintainer:0.15.5 - environment: - MAX_BODY_SIZE: "50mb" - JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs" - RELATIVE_FILE_PATH: "deltas/public" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/public" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/public" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/public" - QUEUE_POLL_INTERVAL: 3000 - USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive - SKIP_MU_AUTH_INITIAL_SYNC: "true" - HEALING_PATCH_GRAPH_BATCH_SIZE: 500 - SERVE_DELTA_FILES: "true" - PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/public" - DELTA_INTERVAL_MS: 10000 - PRETTY_PRINT_DIFF_JSON: "true" - ERROR_GRAPH: "http://mu.semte.ch/graphs/jobs" - volumes: - - ./config/delta-producer/public:/config - - ./data/files/:/share - links: - - db:database - - triplestore:virtuoso - restart: always - labels: - - "logging=true" - logging: *default-logging - ################################################################################ - # DELTA PUBLIC INFORMATION: END - ################################################################################ - - ################################################################################ - # DELTA WORSHIP POSTS: START - ################################################################################ - delta-producer-bg-jobs-initiator-worship-posts: - image: lblod/delta-producer-background-jobs-initiator:0.3.1 - environment: - JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs" - DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts" - CRON_PATTERN_DUMP_JOB: "17 */4 * * *" # At minute 17 every 4 hours - CRON_PATTERN_HEALING_JOB: "0 0 3 * * *" # everyday at 3 AM - START_INITIAL_SYNC: "false" # prefer to disable it now. We want to have feeling with how the DB acts. - labels: - - "logging=true" - links: - - db:database - restart: always - logging: *default-logging - delta-producer-pub-graph-maintainer-worship-posts: - image: lblod/delta-producer-publication-graph-maintainer:0.15.5 - environment: - MAX_BODY_SIZE: "50mb" - JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs" - RELATIVE_FILE_PATH: "deltas/worship-posts" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/worship-posts" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts" - QUEUE_POLL_INTERVAL: 3000 - USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive - SKIP_MU_AUTH_INITIAL_SYNC: "true" - HEALING_PATCH_GRAPH_BATCH_SIZE: 500 - SERVE_DELTA_FILES: "true" - PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts" - DELTA_INTERVAL_MS: 10000 - PRETTY_PRINT_DIFF_JSON: "true" - ERROR_GRAPH: "http://mu.semte.ch/graphs/jobs" - volumes: - - ./config/delta-producer/worship-posts:/config - - ./data/files/:/share - links: - - db:database - - triplestore:virtuoso - restart: always - labels: - - "logging=true" - logging: *default-logging - ################################################################################ - # DELTA WORSHIP POSTS: END - ################################################################################ - ################################################################################ # DELTA CONSUMERS ################################################################################