Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/docker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoncho N. Gunchev <dgunchev@gmail.com>2022-02-18 21:28:09 +0300
committerGitHub <noreply@github.com>2022-02-18 21:28:09 +0300
commitababef74e96d028e67361ab097ca1a9e9e9919ec (patch)
tree608ba42b1d0168ac38cf4dd3d8ab0e6d5c9f6030
parent4b7b164953ff238f26b2cb5fef14aeb4f8b6a150 (diff)
Revert "Simplify first character check in entrypoint.sh (#1679)" #1699 (#1701)
.In php:8.0-fpm-bullseye /bin/sh is dash, which does not support "${X:0:1}" (substring expansion). This reverts commit 05365221755163f7f513bac939d4851e79b06a04. Signed-off-by: Doncho N. Gunchev <dgunchev@gmail.com>
-rwxr-xr-x21/apache/entrypoint.sh2
-rwxr-xr-x21/fpm-alpine/entrypoint.sh2
-rwxr-xr-x21/fpm/entrypoint.sh2
-rwxr-xr-x22/apache/entrypoint.sh2
-rwxr-xr-x22/fpm-alpine/entrypoint.sh2
-rwxr-xr-x22/fpm/entrypoint.sh2
-rwxr-xr-x23/apache/entrypoint.sh2
-rwxr-xr-x23/fpm-alpine/entrypoint.sh2
-rwxr-xr-x23/fpm/entrypoint.sh2
-rwxr-xr-xdocker-entrypoint.sh2
10 files changed, 10 insertions, 10 deletions
diff --git a/21/apache/entrypoint.sh b/21/apache/entrypoint.sh
index 206e287..b6da893 100755
--- a/21/apache/entrypoint.sh
+++ b/21/apache/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/21/fpm-alpine/entrypoint.sh b/21/fpm-alpine/entrypoint.sh
index 206e287..b6da893 100755
--- a/21/fpm-alpine/entrypoint.sh
+++ b/21/fpm-alpine/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/21/fpm/entrypoint.sh b/21/fpm/entrypoint.sh
index 206e287..b6da893 100755
--- a/21/fpm/entrypoint.sh
+++ b/21/fpm/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/22/apache/entrypoint.sh b/22/apache/entrypoint.sh
index 206e287..b6da893 100755
--- a/22/apache/entrypoint.sh
+++ b/22/apache/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/22/fpm-alpine/entrypoint.sh b/22/fpm-alpine/entrypoint.sh
index 206e287..b6da893 100755
--- a/22/fpm-alpine/entrypoint.sh
+++ b/22/fpm-alpine/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/22/fpm/entrypoint.sh b/22/fpm/entrypoint.sh
index 206e287..b6da893 100755
--- a/22/fpm/entrypoint.sh
+++ b/22/fpm/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/23/apache/entrypoint.sh b/23/apache/entrypoint.sh
index 206e287..b6da893 100755
--- a/23/apache/entrypoint.sh
+++ b/23/apache/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/23/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh
index 206e287..b6da893 100755
--- a/23/fpm-alpine/entrypoint.sh
+++ b/23/fpm-alpine/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/23/fpm/entrypoint.sh b/23/fpm/entrypoint.sh
index 206e287..b6da893 100755
--- a/23/fpm/entrypoint.sh
+++ b/23/fpm/entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 206e287..b6da893 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -57,7 +57,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
file_env REDIS_HOST_PASSWORD
echo 'session.save_handler = redis'
# check if redis host is an unix socket path
- if [ "${REDIS_HOST:0:1}" = "/" ]; then
+ if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
else