Garbaye/services-garbaye
3
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

podman-framadate : simplification .env

Browse source
This commit is contained in:
Gitouche 2022-11-20 10:55:59 +01:00
parent 1f083de57f
commit 85ba8275f0
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
podman-framadate/10_install.sh
View file

@ -37,7 +37,7 @@ fi
podman pull docker.io/library/php:7-apache && podman pull docker.io/library/php:7-apache &&
podman pull docker.io/library/mysql:5.7 && 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... " && echo -n "Waiting for initialization to end... " &&
( podman logs -f framadate-app 2>&1 & ) | grep -q 'configured -- resuming normal operations' && ( podman logs -f framadate-app 2>&1 & ) | grep -q 'configured -- resuming normal operations' &&
echo "OK" && echo "OK" &&

4
podman-framadate/docker-compose.yml
View file

@ -6,8 +6,6 @@ services:
environment: environment:
- MYSQL_USER=framadate - MYSQL_USER=framadate
- MYSQL_DATABASE=framadate - MYSQL_DATABASE=framadate
env_file:
- .env
restart: always restart: always
volumes: volumes:
- framadate-db:/var/lib/mysql:Z - framadate-db:/var/lib/mysql:Z
@ -28,8 +26,6 @@ services:
- ADMIN_USER=admin - ADMIN_USER=admin
- APACHE_RUN_USER=www-data - APACHE_RUN_USER=www-data
- FRAMADATE_DEVMODE=1 - FRAMADATE_DEVMODE=1
env_file:
- .env
restart: always restart: always
volumes: volumes: