Source entrypoint files with .envsh extension

JuniorJPDJ · thresheek · commit 667512852e35 · 2022-09-09T17:10:52.000+04:00
This allows reusing variables declared between entrypoint scripts
diff --git a/entrypoint/docker-entrypoint.sh b/entrypoint/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/mainline/alpine-perl/docker-entrypoint.sh b/mainline/alpine-perl/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/mainline/alpine-slim/docker-entrypoint.sh b/mainline/alpine-slim/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/mainline/alpine/docker-entrypoint.sh b/mainline/alpine/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/mainline/debian-perl/docker-entrypoint.sh b/mainline/debian-perl/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/mainline/debian/docker-entrypoint.sh b/mainline/debian/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/stable/alpine-perl/docker-entrypoint.sh b/stable/alpine-perl/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/stable/alpine-slim/docker-entrypoint.sh b/stable/alpine-slim/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/stable/alpine/docker-entrypoint.sh b/stable/alpine/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/stable/debian-perl/docker-entrypoint.sh b/stable/debian-perl/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
diff --git a/stable/debian/docker-entrypoint.sh b/stable/debian/docker-entrypoint.sh
@@ -16,6 +16,15 @@ if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
         echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
         find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
+                *.envsh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Sourcing $f";
+                        source "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
                 *.sh)
                     if [ -x "$f" ]; then
                         echo >&3 "$0: Launching $f";
