From e314570a6b85a9c43bc8ba9d69afaac07050a96f Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 25 Feb 2022 13:30:57 +0100 Subject: [PATCH] Seafile : pull images before podman-compose --- podman-seafile/10_install.sh | 5 +++++ podman-seafile/docker-compose.yml | 4 ++-- podman-seafile/vars.sh | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/podman-seafile/10_install.sh b/podman-seafile/10_install.sh index 74739d1..99f83ea 100755 --- a/podman-seafile/10_install.sh +++ b/podman-seafile/10_install.sh @@ -29,9 +29,14 @@ SEAFILE_ADMIN_EMAIL=${GARBAYE_SEAFILE_ADMIN_EMAIL} EOT export seafile_release +export mariadb_release +export memcached_release export listen_if export listen_port +podman pull docker.io/seafileltd/seafile-mc:${seafile_release} && +podman pull docker.io/library/memcached:${memcached_release} && +podman pull docker.io/library/mariadb:${mariadb_release} && podman-compose up -d && echo -n "Waiting for seahub_settings.py " && while [ ! -e `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py ]; do diff --git a/podman-seafile/docker-compose.yml b/podman-seafile/docker-compose.yml index 4ec7951..1fc09d6 100644 --- a/podman-seafile/docker-compose.yml +++ b/podman-seafile/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.0' services: db: - image: docker.io/library/mariadb:10.3 + image: "docker.io/library/mariadb:${mariadb_release}" container_name: seafile-db environment: - MYSQL_LOG_CONSOLE=true @@ -13,7 +13,7 @@ services: - seafile-net memcached: - image: docker.io/library/memcached:1.6 + image: "docker.io/library/memcached:${memcached_release}" container_name: seafile-memcached command: memcached -m 256 networks: diff --git a/podman-seafile/vars.sh b/podman-seafile/vars.sh index 0b4d74c..3891f19 100644 --- a/podman-seafile/vars.sh +++ b/podman-seafile/vars.sh @@ -2,6 +2,8 @@ pod_name='podman-seafile' service_name="pod-${pod_name}.service" +mariadb_release='10.3' +memcached_release='1.6' seafile_release='8.0.8' dbvolume='podman-seafile_seafile-db' datavolume='podman-seafile_seafile-data'