From 9a05cbd6659be9059545ed7a36040d4ed848b0e7 Mon Sep 17 00:00:00 2001
From: filippo-ferrari <filippo.ferrari.pr@gmail.com>
Date: Fri, 6 Sep 2024 20:30:32 +0200
Subject: [PATCH] feat: changed Dockerfile, docker-compose.yml

---
 .github/workflows/deploy.yml | 22 +++++++++++++---------
 docker-compose.yml           |  5 +++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f8cdc3e..63a51bb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,21 +25,25 @@ jobs:
         with:
           ssh-private-key: ${{ secrets.SSH_KEY }}
 
-      - name: Deploy Docker image
+      - name: Copy files to server
+        run: |
+          scp -o StrictHostKeyChecking=no docker-compose.yml Dockerfile ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:/home/${{ secrets.SSH_USER }}/munera/
+          scp -o StrictHostKeyChecking=no target/munera-1.0-SNAPSHOT.jar ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:/home/${{ secrets.SSH_USER }}/munera/
+
+      - name: Deploy using Docker Compose
         run: |
           ssh -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} << 'EOF'
-            docker pull vaadin-app || true
+            cd /home/${{ secrets.SSH_USER }}/munera
+          
+            # Stop and remove only the specific application container
             docker stop vaadin-app || true
             docker rm vaadin-app || true
-            docker run -d --name vaadin-app -p 8080:8080 \
-              -e DB_ADDRESS=${DB_ADDRESS} \
-              -e DB_USER=${DB_USER} \
-              -e DB_PASSWORD=${DB_PASSWORD} \
-              -e DB_NAME=${DB_NAME} \
-              vaadin-app
+
+            # Build and start the containers (including the database container)
+            docker-compose up -d --build
           EOF
         env:
           DB_ADDRESS: ${{ secrets.DB_ADDRESS }}
           DB_USER: ${{ secrets.DB_USER }}
           DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-          DB_NAME: ${{ secrets.DB_NAME }}
\ No newline at end of file
+          DB_NAME: ${{ secrets.DB_NAME }}
diff --git a/docker-compose.yml b/docker-compose.yml
index de975ee..ab65e4b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,3 +21,8 @@ services:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
     ports:
       - "5432:5432"
+    volumes:
+      - db_data:/var/lib/postgresql/data
+
+volumes:
+  db_data: