добавлен stage

docker-compose.template.yml

@@ -1,9 +1,9 @@
 services:
   app:
-    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:0.1.0
-    container_name: g2s-aggregator
+    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:${IMAGE_TAG}
+    container_name: g2s-aggregator${CONTAINER_SUFFIX}
     ports:
-      - "8003:8000"
+      - "${APP_PORT}:8000"
     depends_on:
       redis:
         condition: service_started
@@ -17,23 +17,23 @@ services:
     logging:
       driver: "json-file"
       options:
-        tag: "g2s-aggregator"
+        tag: "g2s-aggregator${CONTAINER_SUFFIX}"
   redis:
     image: redis:7-alpine
-    container_name: redis
+    container_name: redis${CONTAINER_SUFFIX}
     command: ["redis-server", "--save", "", "--appendonly", "no"]
     ports:
-      - "6379:6379"
+      - "${REDIS_PORT}:6379"
     restart: unless-stopped
   postgres:
     image: postgres:16-alpine
-    container_name: postgres
+    container_name: postgres${CONTAINER_SUFFIX}
     environment:
       POSTGRES_DB: g2s_aggregator
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT}:5432"
     volumes:
       - postgres:/var/lib/postgresql/data
     healthcheck:
@@ -42,8 +42,8 @@ services:
       timeout: 3s
       retries: 10
   migrations:
-    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:0.1.0
-    container_name: g2s-aggregator-migrations
+    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:${IMAGE_TAG}
+    container_name: g2s-aggregator-migrations${CONTAINER_SUFFIX}
     depends_on:
       postgres:
         condition: service_healthy
@@ -54,10 +54,10 @@ services:
     logging:
       driver: "json-file"
       options:
-        tag: "g2s-aggregator-migrations"
+        tag: "g2s-aggregator-migrations${CONTAINER_SUFFIX}"
   waybill-poller:
-    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:0.1.0
-    container_name: g2s-aggregator-waybill-poller
+    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:${IMAGE_TAG}
+    container_name: g2s-aggregator-waybill-poller${CONTAINER_SUFFIX}
     depends_on:
       postgres:
         condition: service_healthy
@@ -70,10 +70,10 @@ services:
     logging:
       driver: "json-file"
       options:
-        tag: "g2s-aggregator-waybill-poller"
+        tag: "g2s-aggregator-waybill-poller${CONTAINER_SUFFIX}"
   waybill-email-sender:
-    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:0.1.0
-    container_name: g2s-aggregator-waybill-email-sender
+    image: gitea.p4r4dls.ru/yusupal1ev/g2s-aggregator:${IMAGE_TAG}
+    container_name: g2s-aggregator-waybill-email-sender${CONTAINER_SUFFIX}
     depends_on:
       postgres:
         condition: service_healthy
@@ -87,11 +87,13 @@ services:
     logging:
       driver: "json-file"
       options:
-        tag: "g2s-aggregator-waybill-email-sender"
+        tag: "g2s-aggregator-waybill-email-sender${CONTAINER_SUFFIX}"
   otel-collector:
     image: otel/opentelemetry-collector-contrib:latest
-    container_name: otel-collector
+    container_name: otel-collector${CONTAINER_SUFFIX}
     user: "0"
+    environment:
+      ENV_NAME: ${ENV_NAME}
     volumes:
       - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
       - /var/lib/docker/containers:/var/lib/docker/containers:ro