From bf87e33277b6fdd13ab86ecc09ba461179fcca84 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Wed, 26 Jun 2024 10:14:14 +0000
Subject: [PATCH] small improvements: script, nextclout, git

---
 git/docker-compose.yaml       |  2 +-
 nextcloud/docker-compose.yaml |  2 +-
 pull-all.sh                   | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/git/docker-compose.yaml b/git/docker-compose.yaml
index a969f8e..56eceee 100644
--- a/git/docker-compose.yaml
+++ b/git/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
 
-  web:
+  forgejo:
     image: codeberg.org/forgejo/forgejo:${FORGEJO_VERSION}
     volumes:
       - ${VOLUMES_PATH}/git/forgejo_data:/data
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml
index 1e288ef..e7006ab 100644
--- a/nextcloud/docker-compose.yaml
+++ b/nextcloud/docker-compose.yaml
@@ -108,7 +108,7 @@ services:
 
 
   db:
-    image: mariadb:10
+    image: mariadb:${MARIADB_VERSION}
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed
     volumes:
       - ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql
diff --git a/pull-all.sh b/pull-all.sh
index 98edd29..9f2eb85 100755
--- a/pull-all.sh
+++ b/pull-all.sh
@@ -1,9 +1,11 @@
 #/bin/bash/
 
 for dir in ./*/ ; do
-   ( cd "$dir" && echo "[Building $dir]" && docker compose build --pull );
+   echo "[Building and Pulling $dir]"
+   cd "$dir";
+   docker compose pull --ignore-buildable
+   docker compose build --pull;
+   cd ..;
+   echo;
 done
 
-for dir in ./*/ ; do
-   ( cd "$dir" && echo "[Pulling $dir]" && docker compose pull --ignore-buildable );
-done