From 0125bc8c11b15164d8b8fdc79abe4a2e65235611 Mon Sep 17 00:00:00 2001
From: Thibaut Valentin <thibaut.valentin@epita.fr>
Date: Thu, 2 Jan 2025 17:46:31 +0100
Subject: [PATCH] fix: .dockerignore

---
 .dockerignore                       | 3 ++-
 .gitea/workflows/deploy_in_prod.yml | 2 +-
 docker-compose.yml                  | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 94810d0..5e66ba3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,4 +2,5 @@
 !target/*-runner
 !target/*-runner.jar
 !target/lib/*
-!target/quarkus-app/*
\ No newline at end of file
+!target/quarkus-app/*
+!src/main/resources/cacerts
\ No newline at end of file
diff --git a/.gitea/workflows/deploy_in_prod.yml b/.gitea/workflows/deploy_in_prod.yml
index 1dac736..4eda386 100644
--- a/.gitea/workflows/deploy_in_prod.yml
+++ b/.gitea/workflows/deploy_in_prod.yml
@@ -50,7 +50,7 @@ jobs:
           username: ${{ secrets.SSH_USER }}
           port: ${{ secrets.SSH_PORT }}
           key: ${{ secrets.SSH_KEY }}
-          source: "target/*-runner,src/main/resources/cacerts,src/main/docker/Dockerfile.native,docker-compose.yml"
+          source: "target/*-runner,src/main/resources/cacerts,src/main/docker/Dockerfile.native,docker-compose.yml,.dockerignore"
           target: ${{ secrets.TARGET_DIR }} # Need to create it first on the VPS
 
       - name: Re-start ffsaf container
diff --git a/docker-compose.yml b/docker-compose.yml
index bec5b6d..37f8190 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "2.3"
-
 services:
   ffsaf:
     container_name: ffsaf
@@ -13,7 +11,9 @@ services:
       - ${PWD}/ffsaf_cle_prive.jks:/work/cle_prive.jks
       - ${PWD}/ffsaf-media:/work/media
     depends_on:
-      - ffsaf-db
+      ffsaf-db:
+        condition: service_healthy
+        restart: true
     networks:
       - intra
       - nginx