Merge branch 'main' of framagit.org:garbaye/services-garbaye

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" &&

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:

podman-jitsi/10_install.sh

@@ -64,15 +64,12 @@ echo "ENABLE_IPV6=0" >> .env
 export listen_if
 export listen_port
 
-# podman-compose 0.1.x + podman 4.0
-#podman-compose --podman-run-args "--env-file .env" up -d &&
-# podman-compose 1.0.4 (devel) + podman 4.1+
 podman-compose --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 
 # Wait for web to be up
-( podman logs --tail=3 -f podman-jitsi_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&
-podman cp assets/welcome-background.png podman-jitsi_web_1:/usr/share/jitsi-meet/images/welcome-background.png &&
-podman exec -t podman-jitsi_web_1 chmod 444 /usr/share/jitsi-meet/images/welcome-background.png &&
+( podman logs --tail=3 -f ${project_name}_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&
+podman cp assets/welcome-background.png ${project_name}_web_1:/usr/share/jitsi-meet/images/welcome-background.png &&
+podman exec -t ${project_name}_web_1 chmod 444 /usr/share/jitsi-meet/images/welcome-background.png &&
 podman pod stop ${pod_name} && echo Pod built and stopped.
 
 # cleanup

podman-jitsi/vars.sh

@@ -7,9 +7,6 @@ listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}"
 GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}"
 ## internal vars : do not touch
 project_name=${PWD##*/}
-# podman-compose 0.1.x + podman 4.0
-#pod_name="${project_name}"
-# podman-compose 1.0.4 (devel) + podman 4.1+
 pod_name="pod_${project_name}"
 service_name="pod-${pod_name}.service"
 get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP

podman-seafile/10_install.sh

@@ -40,7 +40,7 @@ if ! podman image exists ${seafile_image}:${seafile_release}; then
 fi
 podman pull docker.io/library/memcached:${memcached_release} &&
 podman pull docker.io/library/mariadb:${mariadb_release} &&
-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 seahub_settings.py " &&
 while [ ! -e `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py ]; do
     echo -n "."

podman-seafile/docker-compose.yml

@@ -5,8 +5,6 @@ services:
     container_name: seafile-db
     environment:
       - MYSQL_LOG_CONSOLE=true
-    env_file:
-      - .env
     volumes:
       - seafile-db:/var/lib/mysql:Z
 
@@ -26,8 +24,6 @@ services:
       - DB_HOST=db
       - TIME_ZONE=Europe/Paris
       - SEAFILE_SERVER_LETSENCRYPT=false
-    env_file:
-      - .env
     depends_on:
       - db
       - memcached