mirror of
https://github.com/nextcloud/docker.git
synced 2025-04-20 02:46:10 +02:00
Merge 4df45e7ac3
into 645f515e29
This commit is contained in:
commit
ef0495b010
22 changed files with 215 additions and 22 deletions
|
@ -124,7 +124,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -119,7 +119,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -124,7 +124,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -124,7 +124,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -119,7 +119,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -124,7 +124,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -124,7 +124,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -119,7 +119,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -124,7 +124,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
|
@ -118,7 +118,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
|
@ -123,7 +123,8 @@ RUN { \
|
|||
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
|
||||
\
|
||||
mkdir /var/www/data; \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
|
||||
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
|
||||
/docker-entrypoint-hooks.d/pre-installation \
|
||||
/docker-entrypoint-hooks.d/post-installation \
|
||||
/docker-entrypoint-hooks.d/pre-upgrade \
|
||||
/docker-entrypoint-hooks.d/post-upgrade \
|
||||
|
|
14
README.md
14
README.md
|
@ -362,8 +362,9 @@ As long as you have not modified any of the provided config files in `/var/www/h
|
|||
|
||||
## Auto configuration via hook folders
|
||||
|
||||
There are 5 hooks
|
||||
There are 6 hooks
|
||||
|
||||
- `pre-initialization` Executed before the need to update or install Nextcloud is determined
|
||||
- `pre-installation` Executed before the Nextcloud is installed/initiated
|
||||
- `post-installation` Executed after the Nextcloud is installed/initiated
|
||||
- `pre-upgrade` Executed before the Nextcloud is upgraded
|
||||
|
@ -383,6 +384,7 @@ To use the hooks triggered by the `entrypoint` script, either
|
|||
image: nextcloud:stable
|
||||
|
||||
volumes:
|
||||
- ./app-hooks/pre-initialization:/docker-entrypoint-hooks.d/pre-initialization
|
||||
- ./app-hooks/pre-installation:/docker-entrypoint-hooks.d/pre-installation
|
||||
- ./app-hooks/post-installation:/docker-entrypoint-hooks.d/post-installation
|
||||
- ./app-hooks/pre-upgrade:/docker-entrypoint-hooks.d/pre-upgrade
|
||||
|
@ -391,6 +393,16 @@ To use the hooks triggered by the `entrypoint` script, either
|
|||
...
|
||||
```
|
||||
|
||||
## Forcing an upgrade run
|
||||
|
||||
Sometimes you need to force an explicit upgrade run even when the bundled Nextcloud version did not change.
|
||||
An example would be when you have custom apps bundled and you want to update those.
|
||||
|
||||
To do this, you can simply create a file `/tmp/nextcloud-force-initialization` before the need for an upgrade is determined.
|
||||
The content is irrelevant.
|
||||
You can either create this file before starting the container, or you can use the `pre-initialization` hook to create it.
|
||||
After the update has successfully run, the file is removed automatically.
|
||||
|
||||
# Running this image with `docker compose`
|
||||
The easiest way to get a fully featured and functional setup is using a `compose.yaml` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
|
||||
|
||||
|
|
|
@ -156,6 +156,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
flock 9
|
||||
fi
|
||||
|
||||
run_path pre-initialization
|
||||
|
||||
installed_version="0.0.0.0"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
# shellcheck disable=SC2016
|
||||
|
@ -169,7 +171,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
exit 1
|
||||
fi
|
||||
|
||||
need_initialization=false
|
||||
|
||||
if version_greater "$image_version" "$installed_version"; then
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
echo Found /tmp/nextcloud-force-initialization, forcing initialization
|
||||
need_initialization=true
|
||||
fi
|
||||
|
||||
if [ "true" = "$need_initialization" ]; then
|
||||
echo "Initializing nextcloud $image_version ..."
|
||||
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||
|
@ -263,7 +276,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
fi
|
||||
|
||||
run_path post-installation
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
# not enough specified to do a fully automated installation
|
||||
if [ "$install" = false ]; then
|
||||
|
@ -284,6 +297,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||
run_path post-upgrade
|
||||
fi
|
||||
|
||||
if [ -f /tmp/nextcloud-force-initialization ]; then
|
||||
rm /tmp/nextcloud-force-initialization
|
||||
fi
|
||||
|
||||
echo "Initializing finished"
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue