Fix docker setup

Magpie-Monitor · Oct 12, 2024 · 7df9fdc · 7df9fdc
1 parent dc13042
commit 7df9fdc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 47 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -16,6 +16,27 @@ services:
           target: /app/src
         - action: rebuild
           path: ./client/package.json
+  logs-generation-service:
+    user: "0"
+    container_name: magpie-monitor-logs-generation-service
+    restart: on-failure
+    image: magpiemonitor/logs-generation-service
+    build:
+      context: ./go
+      dockerfile: ./docker/logs_generation/Dockerfile
+    environment:
+      - LOGS_INGESTION_QUEUE_HOST=${LOGS_INGESTION_QUEUE_HOST}
+      - LOGS_INGESTION_QUEUE_PORT=${LOGS_INGESTION_QUEUE_PORT}
+      - LOGS_INGESTION_QUEUE_USERNAME=${KAFKA_CLIENT_USERNAME}
+      - LOGS_INGESTION_QUEUE_PASSWORD=${KAFKA_CLIENT_PASSWORD}
+    develop:
+      watch:
+        - action: rebuild
+          path: ./go/services/logs_generation
+          target: /src
+        - action: rebuild
+          path: ./go/pkg
+          target: /src
   pod-agent:
     user: "0" # Elevated permission needed for bind mount
     container_name: magpie-monitor-pod-agent
@@ -91,29 +112,6 @@ services:
       - "6379:6379"
     volumes:
       - redisdata:/data
-  logs-generation-service:
-    user: "0"
-    container_name: magpie-monitor-logs-generation-service
-    restart: on-failure
-    image: magpiemonitor/logs-generation-service
-    build:
-      context: ./go
-      dockerfile: ./docker/logs_generation/Dockerfile
-    environment:
-      - LOGS_INGESTION_QUEUE_HOST=${LOGS_INGESTION_QUEUE_HOST}
-      - LOGS_INGESTION_QUEUE_PORT=${LOGS_INGESTION_QUEUE_PORT}
-      - LOGS_INGESTION_QUEUE_USERNAME=${KAFKA_CLIENT_USERNAME}
-      - LOGS_INGESTION_QUEUE_PASSWORD=${KAFKA_CLIENT_PASSWORD}
-    develop:
-      watch:
-        - action: rebuild
-          path: ./go/services/logs_generation
-          target: /src
-        - action: rebuild
-          path: ./go/pkg
-          target: /src
-    depends_on:
-      - kafka
 
 volumes:
   redisdata:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -83,35 +83,11 @@ services:
       - es-certs:/usr/local/share
     depends_on:
       - kafka
-      - logs-generation-service
     healthcheck:
       test: curl --fail http://localhost:8080 || exit 1
       interval: 10s
       timeout: 5s
       retries: 5
-  logs-generation-service:
-    user: "0"
-    container_name: magpie-monitor-logs-generation-service
-    restart: on-failure
-    image: magpiemonitor/logs-generation-service
-    build:
-      context: ./go
-      dockerfile: ./docker/logs_generation/Dockerfile
-    environment:
-      - LOGS_INGESTION_QUEUE_HOST=${LOGS_INGESTION_QUEUE_HOST}
-      - LOGS_INGESTION_QUEUE_PORT=${LOGS_INGESTION_QUEUE_PORT}
-      - LOGS_INGESTION_QUEUE_USERNAME=${KAFKA_CLIENT_USERNAME}
-      - LOGS_INGESTION_QUEUE_PASSWORD=${KAFKA_CLIENT_PASSWORD}
-    develop:
-      watch:
-        - action: rebuild
-          path: ./go/services/logs_generation
-          target: /src
-        - action: rebuild
-          path: ./go/pkg
-          target: /src
-    depends_on:
-      - kafka
   kafka:
     image: bitnami/kafka
     container_name: magpie-monitor-kafka