update docker-compose.yaml

Author: tmacro

templates/global/docker-compose.yaml

@@ -118,6 +118,23 @@ services:
     profiles:
       - feature-scuba
 
+  backbeat:
+    image: ${BACKBEAT_IMAGE}
+    container_name: workbench-backbeat
+    network_mode: host
+    environment:
+      SUPERVISORD_CONF: supervisord.conf
+      BACKBEAT_CONFIG_FILE: /conf/config.json
+    volumes:
+      - ./config/backbeat/supervisord.conf:/conf/supervisord.conf:ro
+      - ./config/backbeat/config.json:/conf/config.json:ro
+      - ./config/backbeat/config.notification.json:/conf/config.notification.json:ro
+      - ./config/backbeat/env:/conf/env:ro
+      - ./logs/backbeat:/logs
+    profiles:
+      - feature-crr
+      - feature-notifications
+
   redis:
     image: ${REDIS_IMAGE}
     container_name: workbench-redis
@@ -127,97 +144,77 @@ services:
       - feature-notifications
 
   zookeeper:
-    image: ${ZOOKEEPER_IMAGE}
+    build:
+      context: ./config/kafka
     container_name: workbench-zookeeper
     network_mode: host
+    command: /opt/kafka/bin/zookeeper-server-start.sh /opt/kafka/config/zookeeper.properties
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
+    volumes:
+      - ./config/kafka/zookeeper.properties:/opt/kafka/config/zookeeper.properties:ro
+      - ./data/zookeeper:/data
     profiles:
       - feature-crr
       - feature-notifications
 
   kafka:
-    image: ${KAFKA_IMAGE}
+    build:
+      context: ./config/kafka
+    restart: on-failure
     container_name: workbench-kafka
     network_mode: host
-    environment:
-      KAFKA_CFG_ZOOKEEPER_CONNECT: '127.0.0.1:2181/backbeat'
-      KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9092'
-      KAFKA_CFG_ADVERTISED_LISTENERS: 'PLAINTEXT://127.0.0.1:9092'
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
-      KAFKA_ENABLE_KRAFT: 'no'
+    command: /opt/kafka/bin/kafka-server-start.sh /opt/kafka/config/server.properties
+    volumes:
+      - ./config/kafka/server.backbeat.properties:/opt/kafka/config/server.properties:ro
+      - ./data/kafka:/data
     profiles:
       - feature-crr
       - feature-notifications
 
-  kafka-target:
-    image: ${KAFKA_IMAGE}
-    container_name: workbench-kafka-target
+  setup-kafka:
+    build:
+      context: ./config/kafka
+    container_name: workbench-setup-kafka
+    command: /usr/local/bin/setup-kafka.sh
     network_mode: host
     environment:
-      KAFKA_CFG_ZOOKEEPER_CONNECT: '127.0.0.1:2181/notifytarget'
-      KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9093'
-      KAFKA_CFG_ADVERTISED_LISTENERS: 'PLAINTEXT://127.0.0.1:9093'
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
-      KAFKA_ENABLE_KRAFT: 'no'
+      KAFKA_PORT: '9092'
+      TOPICS_TO_CREATE: backbeat-lifecycle-bucket-tasks backbeat-lifecycle-object-tasks backbeat-bucket-notification
+      CREATE_NOTIFICATION_PATHS: 'true'
+      ZOOKEEPER_ENDPOINT: 127.0.0.1:2181/backbeat
+    depends_on:
+      setup-vault:
+        condition: service_completed_successfully
     profiles:
+      - feature-crr
       - feature-notifications
 
-  setup-kafka-target:
+  kafka-destination:
     build:
-      context: ./config/backbeat
-      dockerfile: Dockerfile.setup
-      args:
-        BASE_IMAGE: ${KAFKA_IMAGE}
-    container_name: workbench-setup-kafka-target
+      context: ./config/kafka
+    restart: on-failure
+    container_name: workbench-kafka-destination
     network_mode: host
-    command: /setup-kafka-target.sh
+    command: /opt/kafka/bin/kafka-server-start.sh /opt/kafka/config/server.properties
     profiles:
       - feature-notifications
-
-
-  backbeat:
-    image: ${BACKBEAT_IMAGE}
-    container_name: workbench-backbeat
-    network_mode: host
-    environment:
-      SUPERVISORD_CONF: supervisord.conf
-      BACKBEAT_CONFIG_FILE: /conf/config.json
     volumes:
-      - ./config/backbeat/supervisord.conf:/conf/supervisord.conf:ro
-      - ./config/backbeat/config.json:/conf/config.json:ro
-      - ./config/backbeat/config.notification.json:/conf/config.notification.json:ro
-      - ./config/backbeat/env:/conf/env:ro
-      - ./logs/backbeat:/logs
-    profiles:
-      - feature-crr
-      - feature-notifications
+      - ./config/kafka/server.destination.properties:/opt/kafka/config/server.properties:ro
+      - ./config/kafka/config.properties:/opt/kafka/config/config.properties:ro
+      - ./data/kafka-destination:/data
 
-  setup-backbeat:
+  setup-kafka-destination:
     build:
-      context: ./config/backbeat
-      dockerfile: Dockerfile.setup
-      args:
-        BASE_IMAGE: ${KAFKA_IMAGE}
-    container_name: workbench-setup-backbeat
+      context: ./config/kafka
+    container_name: workbench-setup-kafka-destination
+    environment:
+      TOPICS_TO_CREATE: notifications
+      KAFKA_PORT: '9094'
+      JAAS_CONFIG: '/opt/kafka/config/config.properties'
     network_mode: host
+    command: /usr/local/bin/setup-kafka.sh
     profiles:
-      - feature-crr
       - feature-notifications
-    depends_on:
-      setup-vault:
-        condition: service_completed_successfully
-
-  # setup-scuba:
-  #   build:
-  #     context: ./config/scuba
-  #     dockerfile: Dockerfile.setup
-  #     args:
-  #       BASE_IMAGE: ${SCUBA_IMAGE}
-  #   container_name: workbench-setup-scuba
-  #   network_mode: host
-  #   depends_on:
-  #     setup-vault:
-  #       condition: service_completed_successfully
-  #   volumes:
-  #     - ./config/vault/:/secrets
+    volumes:
+      - ./config/kafka/config.properties:/opt/kafka/config/config.properties:ro