Merge branch 'master-v5' into instance/fid

devops/docker/autoconfig/entrypoint.sh

@@ -17,16 +17,16 @@
 # @author  Sebastian Kehr <kehr@ub.uni-leipzig.de>
 # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3
 
-until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/autoconfig ]; do :; done
-set -a; . ./data/docker/env/autoconfig; set +a
-
 if [ "$(whoami)" = "node" ]; then
-  echo "$VUFIND_DEFAULTS" > "./data/docker/autoconfig/$VUFIND_SITE.json"
   [ -d "$HOME" ] || PREFIX=$HOME npm install -g @ubleipzig/autoconfig@2.3.2
+  echo "$VUFIND_DEFAULTS" > "./data/docker/autoconfig/$VUFIND_SITE.json"
   exec "$HOME/bin/autoconfig" -c ./data/docker/autoconfig "$@"
   exit
 fi
 
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/autoconfig ]; do :; done
+set -a; . ./data/docker/env/autoconfig; set +a
+
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"
 sed -i "s/$(id -u node):$(id -g node)/$UIDGID/" /etc/passwd
 sh -c "exit 1"; while [ $? -eq 1 ]; do sleep 1; nc -zv "db:3306" >/dev/null 2>&1; done;