diff options
| author | Tilo Spannagel <development@tilosp.de> | 2019-04-30 13:07:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 13:07:31 +0200 |
| commit | a2d0c579210a72408a98c12f25ddd7a6620035f0 (patch) | |
| tree | 5caaf6997b768b40a5a90649930b303e23e61d0e /14.0/fpm-alpine | |
| parent | 0578591681e6020a8cd16d39d3128f187627d6c8 (diff) | |
| parent | f0fd46a989020bd7d213cf57b15b4d461cb6376b (diff) | |
Merge pull request #733 from nextcloud/revert-729-secrets
Revert "Compatibility with docker secrets (Fix #560)"
Diffstat (limited to '14.0/fpm-alpine')
| -rwxr-xr-x | 14.0/fpm-alpine/entrypoint.sh | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index a45147fa..78bd0a8d 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -19,31 +19,6 @@ run_as() { fi } -# usage: file_env VAR [DEFAULT] -# ie: file_env 'XYZ_DB_PASSWORD' 'example' -# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of -# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - echo >&2 "error: both $var and $fileVar are set (but are exclusive)" - exit 1 - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - else - # do not define empty vars - return - fi - export "$var"="$val" - unset "$fileVar" -} - if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then @@ -92,8 +67,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP if [ "$installed_version" = "0.0.0.0" ]; then echo "New nextcloud instance" - file_env NEXTCLOUD_ADMIN_PASSWORD - if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then # shellcheck disable=SC2016 install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"' @@ -108,9 +81,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' fi - file_env MYSQL_PASSWORD - file_env POSTGRES_PASSWORD - install=false if [ -n "${SQLITE_DATABASE+x}" ]; then echo "Installing with SQLite database" |