Merge remote-tracking branch 'origin/main'

modules/events-server/docker/docker-compose.yml

@@ -13,13 +13,17 @@ services:
         DIST_DIR: "./build/distributions/"
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
-      KAFKA_STREAMS_STATE_DIR: "http://kafka:29092"
+      # KAFKA_STREAMS_STATE_DIR: "http://kafka:29092"
       SERVER_PORT: "12081"
-#    ports:
-#      - "12081:12081" # http and ws
+    ports:
+      - "12080:12081" # http and ws
     networks:
       - "kafka-nw"
+      - "kafkatorio-nw"
       - "traefik-nw"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.events-server-kafkatorio.loadbalancer.server.port=12081"
 
 networks:
   kafka-nw:

modules/infra-factorio-server/src/docker-compose.yml

@@ -10,6 +10,9 @@ services:
     restart: "no"
     networks:
       - "kafkatorio-nw"
+      - "traefik-nw"
+    labels:
+      - "traefik.enable=true"
     ports:
       - "34197:34197/udp" # factorio
       - "27015:27015/tcp" # rcon
@@ -35,3 +38,6 @@ networks:
   kafkatorio-nw:
     name: "kafkatorio-nw"
     external: true
+  traefik-nw:
+    name: "traefik-nw"
+    external: true

modules/infra-kafka-cluster/src/docker-compose.yml

@@ -34,6 +34,8 @@ services:
     networks:
       - "kafka-nw"
       - "traefik-nw"
+    labels:
+      - "traefik.enable=true"
     # ports:
     #   - "8080:8080"
     environment:

modules/infra-kafka-pipe/src/docker-compose.yml

@@ -20,7 +20,11 @@ services:
       KAFKA_HOST: "kafka:29092"
     volumes:
       # Windows (requires privileged/root)
-      - "//var/run/docker.sock:/var/run/docker.sock"
+#      - "//var/run/docker.sock:/var/run/docker.sock"
+      
+      # Rootless:
+      - "/run/user/1000/docker.sock:/var/run/docker.sock"
+
       # Unix?
       # - "/var/run/docker.sock:/var/run/docker.sock"
 

modules/web-map/docker/docker-compose.yml

@@ -13,6 +13,8 @@ services:
     networks:
       - "kafkatorio-nw"
       - "traefik-nw"
+    labels:
+      - "traefik.enable=true"
 
 networks:
   kafkatorio-nw: