From 85ba8275f0c25ad51b6ae16a2fcc5c1d1f683d7a Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sun, 20 Nov 2022 10:55:59 +0100
Subject: [PATCH] podman-framadate : simplification .env

---
 podman-framadate/10_install.sh      | 2 +-
 podman-framadate/docker-compose.yml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/podman-framadate/10_install.sh b/podman-framadate/10_install.sh
index b67aa61..30246a8 100755
--- a/podman-framadate/10_install.sh
+++ b/podman-framadate/10_install.sh
@@ -37,7 +37,7 @@ fi
 podman pull docker.io/library/php:7-apache &&
 podman pull docker.io/library/mysql:5.7 &&
 
-podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra " up -d &&
+podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 echo -n "Waiting for initialization to end... " &&
 ( podman logs -f framadate-app 2>&1 & ) | grep -q 'configured -- resuming normal operations' &&
 echo "OK" &&
diff --git a/podman-framadate/docker-compose.yml b/podman-framadate/docker-compose.yml
index 60820e1..a15c106 100644
--- a/podman-framadate/docker-compose.yml
+++ b/podman-framadate/docker-compose.yml
@@ -6,8 +6,6 @@ services:
         environment:
             - MYSQL_USER=framadate
             - MYSQL_DATABASE=framadate
-        env_file:
-            - .env
         restart: always
         volumes:
             - framadate-db:/var/lib/mysql:Z
@@ -28,8 +26,6 @@ services:
             - ADMIN_USER=admin
             - APACHE_RUN_USER=www-data
             - FRAMADATE_DEVMODE=1
-        env_file:
-            - .env
         restart: always
 
 volumes: