From 42b9bff1848b3beba27c62458fe5fa424fe21c39 Mon Sep 17 00:00:00 2001
From: Sebastian Kehr <kehr@ub.uni-leipzig.de>
Date: Fri, 6 Mar 2020 16:12:02 +0100
Subject: [PATCH] refs #17113 [master-v5] wait until expected env files exist
---
devops/docker/autoconfig/entrypoint.sh | 4 ++--
devops/docker/composer/entrypoint.sh | 4 ++--
devops/docker/db/entrypoint.sh | 4 ++--
devops/docker/grunt/entrypoint.sh | 4 ++--
devops/docker/mail/entrypoint.sh | 4 ++--
devops/docker/php/entrypoint.sh | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/devops/docker/autoconfig/entrypoint.sh b/devops/docker/autoconfig/entrypoint.sh
index 16a30377f02..c2734b0e17e 100755
--- a/devops/docker/autoconfig/entrypoint.sh
+++ b/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
diff --git a/devops/docker/composer/entrypoint.sh b/devops/docker/composer/entrypoint.sh
index 7d7261c6dda..dd445c103f4 100755
--- a/devops/docker/composer/entrypoint.sh
+++ b/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
diff --git a/devops/docker/db/entrypoint.sh b/devops/docker/db/entrypoint.sh
index 8d4496520ab..168bb590f52 100755
--- a/devops/docker/db/entrypoint.sh
+++ b/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
diff --git a/devops/docker/grunt/entrypoint.sh b/devops/docker/grunt/entrypoint.sh
index ba4fc1f8a05..06189b8b841 100755
--- a/devops/docker/grunt/entrypoint.sh
+++ b/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' .)}"
diff --git a/devops/docker/mail/entrypoint.sh b/devops/docker/mail/entrypoint.sh
index caf4219c3fe..c2fb39bfc2e 100755
--- a/devops/docker/mail/entrypoint.sh
+++ b/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 "$@" &
diff --git a/devops/docker/php/entrypoint.sh b/devops/docker/php/entrypoint.sh
index 17f535933d4..927b845f7d1 100755
--- a/devops/docker/php/entrypoint.sh
+++ b/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
--
GitLab