From 5886a7a5704a227caa0592f7f66d647202196962 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Sun, 22 Mar 2020 22:23:42 +0100 Subject: [PATCH] Add NEXTCLOUD_ADMIN_USER, POSTGRES_DB, POSTGRES_USER Signed-off-by: Jonas Thelemann --- 16.0/apache/entrypoint.sh | 3 +++ 16.0/fpm-alpine/entrypoint.sh | 3 +++ 16.0/fpm/entrypoint.sh | 3 +++ 17.0/apache/entrypoint.sh | 3 +++ 17.0/fpm-alpine/entrypoint.sh | 3 +++ 17.0/fpm/entrypoint.sh | 3 +++ 18.0/apache/entrypoint.sh | 3 +++ 18.0/fpm-alpine/entrypoint.sh | 3 +++ 18.0/fpm/entrypoint.sh | 3 +++ docker-entrypoint.sh | 3 +++ 10 files changed, 30 insertions(+) diff --git a/16.0/apache/entrypoint.sh b/16.0/apache/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/16.0/apache/entrypoint.sh +++ b/16.0/apache/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/16.0/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/16.0/fpm-alpine/entrypoint.sh +++ b/16.0/fpm-alpine/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/16.0/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/16.0/fpm/entrypoint.sh +++ b/16.0/fpm/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/17.0/apache/entrypoint.sh +++ b/17.0/apache/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/17.0/fpm-alpine/entrypoint.sh +++ b/17.0/fpm-alpine/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/17.0/fpm/entrypoint.sh +++ b/17.0/fpm/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/18.0/apache/entrypoint.sh +++ b/18.0/apache/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/18.0/fpm-alpine/entrypoint.sh +++ b/18.0/fpm-alpine/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/18.0/fpm/entrypoint.sh +++ b/18.0/fpm/entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 6cdd2a72..e666b849 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -104,6 +104,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "New nextcloud instance" file_env NEXTCLOUD_ADMIN_PASSWORD + file_env NEXTCLOUD_ADMIN_USER if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 @@ -118,7 +119,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi file_env MYSQL_PASSWORD + file_env POSTGRES_DB file_env POSTGRES_PASSWORD + file_env POSTGRES_USER install=false if [ -n "${SQLITE_DATABASE+x}" ]; then