Simplify gs config a bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Makefile

@@ -15,8 +15,10 @@ pull:
 
 check: dockerfilelint shellcheck
 
+.ONESHELL:
 dockerfilelint:
-	for file in $(find docker/ -type f -iname 'Dockerfile.*' -maxdepth 1); do dockerfilelint $file; done;
+	for file in $$(find docker/ -type f -iname 'Dockerfile.*' -maxdepth 1); do dockerfilelint $$file; done;
 
+.ONESHELL:
 shellcheck:
 	for file in $(find . -type f -iname '*.sh' -not -path './docker/3rdparty/*'); do shellcheck --format=gcc $file; done;

docker-compose.yml

@@ -376,10 +376,7 @@ services:
       - clam:/var/lib/clamav
 
   portal:
-    # image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
-    build:
-      context: ./docker
-      dockerfile: Dockerfile.php73
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
     environment:
       VIRTUAL_HOST: portal${DOMAIN_SUFFIX}
       SQL: 'mysql'
@@ -424,9 +421,7 @@ services:
       - mail
 
   lookup:
-    build:
-      context: ./docker
-      dockerfile: Dockerfile.lookupserver
+    image: ghcr.io/juliushaertl/nextcloud-dev-lookupserver:latest
     environment:
       VIRTUAL_HOST: "lookup${DOMAIN_SUFFIX}"
     # volumes:

docker/bin/bootstrap.sh

@@ -196,6 +196,8 @@ install() {
 	# [ -e /var/www/html/nc-dev-autosetup.sh ] && bash /var/www/html/nc-dev-autosetup.sh
 
 	echo "🔧 Setting up users and LDAP in the background"
+	INSTANCENAME=$(echo "$VIRTUAL_HOST" | cut -d '.' -f1)
+	configure_add_user $INSTANCENAME &
 	configure_add_user user1 &
 	configure_add_user user2 &
 	configure_add_user user3 &

docker/configs/cron.conf

@@ -1,2 +1,2 @@
 # m   h  dom mon dow   command
-*/5  *  *   *   *     sudo -u www-data php -f /var/www/html/cron.php >> /var/log/cron/nextcloud.log 2>&1
+*/5  *  *   *   *     sudo -E -u www-data php -f /var/www/html/cron.php >> /var/log/cron/nextcloud.log 2>&1