mirror of
https://github.com/nextcloud/docker.git
synced 2025-04-19 18:36:09 +02:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
2fab0ea8fc
11 changed files with 11 additions and 11 deletions
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||
cfgFile=$(basename "$cfgPath")
|
||||
|
||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||
fi
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
stable_channel='29.0.6'
|
||||
stable_channel='29.0.7'
|
||||
|
||||
self="$(basename "$BASH_SOURCE")"
|
||||
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
|
Loading…
Add table
Reference in a new issue