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

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

Browse source
This commit is contained in:
KsmoinO 2022-11-20 12:05:58 +01:00
parent 93e75cd509 0bac5a81a9
commit f29f9d15b8
6 changed files with 5 additions and 19 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:

9
podman-jitsi/10_install.sh
View file

@ -64,15 +64,12 @@ echo "ENABLE_IPV6=0" >> .env
export listen_if export listen_if
export listen_port 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 && 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 # Wait for web to be up
( podman logs --tail=3 -f podman-jitsi_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' && ( podman logs --tail=3 -f ${project_name}_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 cp assets/welcome-background.png ${project_name}_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 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. podman pod stop ${pod_name} && echo Pod built and stopped.
# cleanup # cleanup

3
podman-jitsi/vars.sh
View file

@ -7,9 +7,6 @@ listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}"
GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}" GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}"
## internal vars : do not touch ## internal vars : do not touch
project_name=${PWD##*/} 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}" pod_name="pod_${project_name}"
service_name="pod-${pod_name}.service" service_name="pod-${pod_name}.service"
get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP

2
podman-seafile/10_install.sh
View file

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

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

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