Fix CD 2

Author: codbid

.github/workflows/deploy.yaml

@@ -28,13 +28,13 @@ jobs:
 
       - name: Build and push Docker image
         run: |
-          docker build -t ${{ secrets.DOCKER_USERNAME }}/app:latest .
-          docker push ${{ secrets.DOCKER_USERNAME }}/app:latest
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/ecm:latest .
+          docker push ${{ secrets.DOCKER_USERNAME }}/ecm:latest
 
       - name: Add server to known_hosts
         run: |
           ssh-keyscan -p 2231 digital.mephi.ru >> ~/.ssh/known_hosts
 
       - name: Deploy with Docker Compose
         run: |
-          ssh -v -p 2231 ubuntu@digital.mephi.ru "cd /home/ubuntu/eDocHub/ && sudo docker-compose pull && sudo docker-compose up -d"
+          ssh -v -p 2231 ubuntu@digital.mephi.ru "cd /home/ubuntu/eDocHub/ && sudo docker-compose down && sudo docker-compose pull && sudo docker-compose up -d --build"

docker-compose.yaml

@@ -1,64 +1,64 @@
-services:
-  postgres:
-    image: postgres:latest
-    container_name: postgres
-    environment:
-      POSTGRES_DB: postgres
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: 123
-    ports:
-      - "5432:5432"
+  services:
+    postgres:
+      image: postgres:latest
+      container_name: postgres
+      environment:
+        POSTGRES_DB: postgres
+        POSTGRES_USER: postgres
+        POSTGRES_PASSWORD: 123
+      ports:
+        - "5432:5432"
 
-  minio:
-    image: quay.io/minio/minio:RELEASE.2024-10-13T13-34-11Z
-    volumes:
-      - ./data:/data
-    ports:
-      - "9000:9000"
-      - "9001:9001"
-    environment:
-      MINIO_ROOT_USER: 'minioadmin'
-      MINIO_ROOT_PASSWORD: 'minioadmin'
-      MINIO_ADDRESS: ':9000'
-      MINIO_CONSOLE_ADDRESS: ':9001'
-    command: minio server /data
+    minio:
+      image: quay.io/minio/minio:RELEASE.2024-10-13T13-34-11Z
+      volumes:
+        - ./data:/data
+      ports:
+        - "9000:9000"
+        - "9001:9001"
+      environment:
+        MINIO_ROOT_USER: 'minioadmin'
+        MINIO_ROOT_PASSWORD: 'minioadmin'
+        MINIO_ADDRESS: ':9000'
+        MINIO_CONSOLE_ADDRESS: ':9001'
+      command: minio server /data
 
-  zookeeper:
-    image: wurstmeister/zookeeper:latest
-    ports:
-      - "2181:2181"
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
+    zookeeper:
+      image: wurstmeister/zookeeper:latest
+      ports:
+        - "2181:2181"
+      environment:
+        ZOOKEEPER_CLIENT_PORT: 2181
+        ZOOKEEPER_TICK_TIME: 2000
 
-  kafka:
-    image: wurstmeister/kafka:latest
-    ports:
-      - "9092:9092"
-      - "9093:9093"
-    environment:
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
-      KAFKA_LISTENERS: INSIDE://0.0.0.0:9093,OUTSIDE://0.0.0.0:9092
-      KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
-    depends_on:
-      - zookeeper
+    kafka:
+      image: wurstmeister/kafka:latest
+      ports:
+        - "9092:9092"
+        - "9093:9093"
+      environment:
+        KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+        KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
+        KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
+        KAFKA_LISTENERS: INSIDE://0.0.0.0:9093,OUTSIDE://0.0.0.0:9092
+        KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE
+      depends_on:
+        - zookeeper
 
-  app:
-    image: ecm
-    build:
-      context: .
-      dockerfile: Dockerfile
-    depends_on:
-      - postgres
-      - minio
-      - kafka
-    ports:
-      - "8080:8080"
-    environment:
-      SPRING_KAFKA_BOOTSTRAP_SERVERS: https://kafka:9093
-      MINIO_URL: http://minio:9000
-      SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/postgres
-      SPRING_DATASOURCE_USERNAME: postgres
-      SPRING_DATASOURCE_PASSWORD: 123
+    app:
+      image: ecm
+      build:
+        context: .
+        dockerfile: Dockerfile
+      depends_on:
+        - postgres
+        - minio
+        - kafka
+      ports:
+        - "8080:8080"
+      environment:
+        SPRING_KAFKA_BOOTSTRAP_SERVERS: https://kafka:9093
+        MINIO_URL: http://minio:9000
+        SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/postgres
+        SPRING_DATASOURCE_USERNAME: postgres
+        SPRING_DATASOURCE_PASSWORD: 123