Merge branch 'instance/fid' into instance/fid_adlr

devops/docker/autoconfig/entrypoint.sh

@@ -17,8 +17,8 @@
 # @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; do :; done
-set -a; [ -f ./data/docker/env/autoconfig ] && . ./data/docker/env/autoconfig; set +a
+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
   [ -d "$HOME" ] || PREFIX=$HOME npm install -g @ubleipzig/autoconfig@2.3.2

devops/docker/composer/entrypoint.sh

@@ -23,8 +23,8 @@ if [ "$(whoami)" = "php" ]; then
   exit
 fi
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/composer ] && . ./data/docker/env/composer; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/composer ]; do :; done
+set -a; . ./data/docker/env/composer; set +a
 
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"
 echo "php:x:$UIDGID:php::/bin/sh" >> /etc/passwd

devops/docker/db/entrypoint.sh

@@ -17,7 +17,7 @@
 # @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; do :; done
-set -a; [ -f ./data/docker/env/db ] && . ./data/docker/env/db; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/db ]; do :; done
+set -a; . ./data/docker/env/db; set +a
 
 exec docker-entrypoint.sh "$@"
\ No newline at end of file

devops/docker/env/entrypoint.sh

@@ -29,8 +29,8 @@ mkdir -p "$DIR"; chown "$UIDGID" $DIR/.. $DIR
 JSON=$(spruce merge $(find docker-env.*.yml) | spruce json)
 for KEY in $(echo "$JSON" | jq -r 'keys | join(" ")'); do
   FILE="$DIR/$KEY"; [ -f "$FILE" ] && rm "$FILE"
-  for VAR in $(echo "$JSON" | jq -r ".$KEY | keys | join(\" \")"); do
-    VAL=$(echo "$JSON" | jq -r ".$KEY.$VAR")
+  for VAR in $(echo "$JSON" | jq -r ".\"$KEY\" | keys | join(\" \")"); do
+    VAL=$(echo "$JSON" | jq -r ".\"$KEY\".\"$VAR\"")
     echo "$VAR=$(quote "$VAL")" >> "$FILE"
   done
   chown "$UIDGID" $FILE

devops/docker/grunt/entrypoint.sh

@@ -35,8 +35,8 @@ if [ "$(whoami)" = "node" ]; then
   exit
 fi
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/grunt ] && . ./data/docker/env/grunt; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/grunt ]; do :; done
+set -a; . ./data/docker/env/grunt; set +a
 
 trap term_grunt TERM
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"

devops/docker/mail/entrypoint.sh

@@ -17,8 +17,8 @@
 # @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; do :; done
-set -a; [ -f ./data/docker/env/mail ] && . ./data/docker/env/mail; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/mail ]; do :; done
+set -a; . ./data/docker/env/mail; set +a
 
 trap 'supervisorctl stop dovecot && supervisorctl stop postfix && exit 0' TERM
 /docker/init "$@" &

devops/docker/php/entrypoint.sh

@@ -17,8 +17,8 @@
 # @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; do :; done
-set -a; [ -f ./data/docker/env/php ] && . ./data/docker/env/php; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/php ]; do :; done
+set -a; . ./data/docker/env/php; set +a
 
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"
 sed -i "s/$(id -u www-data):$(id -g www-data)/$UIDGID/" /etc/passwd