aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2024-11-17 18:46:43 +01:00
Code Activity

Revert "Fix triggering install and update script (#1181)"

Browse source 
This reverts commit de90bed706.
This commit is contained in:
J0WI 2020-07-28 14:40:22 +02:00
parent 9bfe454bd4
commit 1e6d0620af
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
17.0/apache/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
17.0/fpm-alpine/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
17.0/fpm/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
18.0/apache/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
18.0/fpm-alpine/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
18.0/fpm/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
19.0/apache/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
19.0/fpm-alpine/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

4
19.0/fpm/entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"

2
README.md
View file

@ -133,7 +133,7 @@ One or more trusted domains can be set through environment variable, too. They w
- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains - `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
The install and update script is only triggered when a default command is used (`apache2-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
- `NEXTCLOUD_UPDATE` (default: _0_) - `NEXTCLOUD_UPDATE` (default: _0_)

4
docker-entrypoint.sh
View file

@ -43,13 +43,13 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
if expr "$1" : "apache2-foreground" 1>/dev/null; then if expr "$1" : "apache" 1>/dev/null; then
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
a2disconf remoteip a2disconf remoteip
fi fi
fi fi
if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then if [ -n "${REDIS_HOST+x}" ]; then
echo "Configuring Redis as session handler" echo "Configuring Redis as session handler"