mirror of
https://github.com/linuxserver/docker-nextcloud.git
synced 2026-06-03 09:57:35 +00:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e2fb6e3bd | |||
| 989b190595 | |||
| ba1619d05b | |||
| c559f8ac37 | |||
| b2b6a72a64 | |||
| c1095c4c21 | |||
| 952884138f | |||
| 5312dc251b |
+57
-58
@@ -16,7 +16,7 @@ amphp/process v1.1.9 php-composer
|
||||
amphp/serialization v1.0.0 php-composer
|
||||
amphp/sync v1.4.2 php-composer
|
||||
andrewdalpino/okbloomer 1.0.0 php-composer
|
||||
anstream 0.6.5 rust-crate
|
||||
anstream 0.6.8 rust-crate
|
||||
anstyle 1.0.4 rust-crate
|
||||
anstyle-parse 0.2.3 rust-crate
|
||||
anstyle-query 1.0.2 rust-crate
|
||||
@@ -24,7 +24,7 @@ anyhow 1.0.79 rust-crate
|
||||
anyhow 1.0.98 rust-crate
|
||||
aom-libs 3.12.1-r0 apk
|
||||
apache2-utils 2.4.65-r0 apk
|
||||
apk-tools 2.14.9-r2 apk
|
||||
apk-tools 2.14.9-r3 apk
|
||||
app_api 1.0.0 npm
|
||||
apr 1.7.5-r0 apk
|
||||
apr-util 1.6.3-r1 apk
|
||||
@@ -63,7 +63,7 @@ clap_complete 4.4.6 rust-crate
|
||||
clap_derive 4.4.7 rust-crate
|
||||
clap_lex 0.6.0 rust-crate
|
||||
colorchoice 1.0.0 rust-crate
|
||||
composer 2.8.11 binary
|
||||
composer 2.8.12 binary
|
||||
composer/pcre 3.3.1 php-composer
|
||||
composer/semver 3.4.2 php-composer
|
||||
composer/xdebug-handler 3.0.5 php-composer
|
||||
@@ -75,7 +75,7 @@ coreutils-sha512sum 9.7-r1 apk
|
||||
crc 3.3.0 rust-crate
|
||||
crc-catalog 2.4.0 rust-crate
|
||||
crossbeam 0.8.4 rust-crate
|
||||
crossbeam-channel 0.5.11 rust-crate
|
||||
crossbeam-channel 0.5.14 rust-crate
|
||||
crossbeam-deque 0.8.5 rust-crate
|
||||
crossbeam-epoch 0.9.18 rust-crate
|
||||
crossbeam-queue 0.3.11 rust-crate
|
||||
@@ -86,11 +86,10 @@ dbus-libs 1.16.2-r1 apk
|
||||
deepdiver/zipstreamer v2.0.3 php-composer
|
||||
deepdiver1975/tarstreamer v2.1.0 php-composer
|
||||
dnoegel/php-xdg-base-dir v0.1.1 php-composer
|
||||
doctrine/cache 2.2.0 php-composer
|
||||
doctrine/dbal 3.9.1 php-composer
|
||||
doctrine/dbal 3.10.2 php-composer
|
||||
doctrine/deprecations 1.1.3 php-composer
|
||||
doctrine/deprecations 1.1.5 php-composer
|
||||
doctrine/event-manager 1.2.0 php-composer
|
||||
doctrine/event-manager 2.0.1 php-composer
|
||||
doctrine/lexer 3.0.1 php-composer
|
||||
dolby_vision 3.3.1 rust-crate
|
||||
egulias/email-validator 4.0.4 php-composer
|
||||
@@ -145,12 +144,12 @@ icewind/smb v3.7.0 php-composer
|
||||
icewind/streams v0.7.8 php-composer
|
||||
icu-data-en 76.1-r1 apk
|
||||
icu-libs 76.1-r1 apk
|
||||
imagemagick 7.1.2.0-r0 apk
|
||||
imagemagick-jpeg 7.1.2.0-r0 apk
|
||||
imagemagick-jxl 7.1.2.0-r0 apk
|
||||
imagemagick-libs 7.1.2.0-r0 apk
|
||||
imagemagick-openexr 7.1.2.0-r0 apk
|
||||
imagemagick-webp 7.1.2.0-r0 apk
|
||||
imagemagick 7.1.2.3-r0 apk
|
||||
imagemagick-jpeg 7.1.2.3-r0 apk
|
||||
imagemagick-jxl 7.1.2.3-r0 apk
|
||||
imagemagick-libs 7.1.2.3-r0 apk
|
||||
imagemagick-openexr 7.1.2.3-r0 apk
|
||||
imagemagick-webp 7.1.2.3-r0 apk
|
||||
imath 3.1.12-r0 apk
|
||||
interpolate_name 0.2.4 rust-crate
|
||||
itertools 0.10.5 rust-crate
|
||||
@@ -168,7 +167,7 @@ lcms2 2.16-r0 apk
|
||||
lcobucci/clock 3.0.0 php-composer
|
||||
ldb 4.21.4-r4 apk
|
||||
libSvtAv1Enc 2.3.0-r0 apk
|
||||
libapk2 2.14.9-r2 apk
|
||||
libapk2 2.14.9-r3 apk
|
||||
libarchive 3.8.1-r0 apk
|
||||
libass 0.17.3-r0 apk
|
||||
libasyncns 0.8-r4 apk
|
||||
@@ -182,7 +181,7 @@ libbz2 1.0.8-r6 apk
|
||||
libc 0.2.155 rust-crate
|
||||
libc 0.2.172 rust-crate
|
||||
libcap2 2.76-r0 apk
|
||||
libcrypto3 3.5.2-r0 apk
|
||||
libcrypto3 3.5.4-r0 apk
|
||||
libcurl 8.14.1-r1 apk
|
||||
libdav1d 1.5.1-r0 apk
|
||||
libdeflate 1.23-r0 apk
|
||||
@@ -191,7 +190,7 @@ libdrm 2.4.124-r0 apk
|
||||
libeconf 0.6.3-r0 apk
|
||||
libedit 20250104.3.1-r1 apk
|
||||
libevent 2.1.12-r8 apk
|
||||
libexpat 2.7.1-r0 apk
|
||||
libexpat 2.7.3-r0 apk
|
||||
libffi 3.4.8-r0 apk
|
||||
libflac 1.4.3-r1 apk
|
||||
libformw 6.5_p20250503-r0 apk
|
||||
@@ -228,7 +227,7 @@ libsndfile 1.2.2-r2 apk
|
||||
libsodium 1.0.20-r0 apk
|
||||
libsrt 1.5.3-r1 apk
|
||||
libssh 0.11.2-r0 apk
|
||||
libssl3 3.5.2-r0 apk
|
||||
libssl3 3.5.4-r0 apk
|
||||
libstdc++ 14.2.0-r6 apk
|
||||
libtasn1 4.20.0-r0 apk
|
||||
libtheora 1.1.1-r18 apk
|
||||
@@ -309,7 +308,7 @@ openexr-libiex 3.3.2-r0 apk
|
||||
openexr-libilmthread 3.3.2-r0 apk
|
||||
openexr-libopenexr 3.3.2-r0 apk
|
||||
openexr-libopenexrcore 3.3.2-r0 apk
|
||||
openssl 3.5.2-r0 apk
|
||||
openssl 3.5.4-r0 apk
|
||||
opus 1.5.2-r1 apk
|
||||
orc 0.4.40-r1 apk
|
||||
p11-kit 0.25.5-r2 apk
|
||||
@@ -330,32 +329,32 @@ php-http/httplug 2.4.1 php-composer
|
||||
php-http/promise 1.3.1 php-composer
|
||||
php-opencloud/openstack v3.14.0 php-composer
|
||||
php-webdriver/webdriver 1.15.2 php-composer
|
||||
php84 8.4.11-r0 apk
|
||||
php84-bcmath 8.4.11-r0 apk
|
||||
php84-bz2 8.4.11-r0 apk
|
||||
php84-common 8.4.11-r0 apk
|
||||
php84-ctype 8.4.11-r0 apk
|
||||
php84-curl 8.4.11-r0 apk
|
||||
php84-dom 8.4.11-r0 apk
|
||||
php84-exif 8.4.11-r0 apk
|
||||
php84-fileinfo 8.4.11-r0 apk
|
||||
php84-fpm 8.4.11-r0 apk
|
||||
php84-ftp 8.4.11-r0 apk
|
||||
php84-gd 8.4.11-r0 apk
|
||||
php84-gmp 8.4.11-r0 apk
|
||||
php84-iconv 8.4.11-r0 apk
|
||||
php84-intl 8.4.11-r0 apk
|
||||
php84-ldap 8.4.11-r0 apk
|
||||
php84-mbstring 8.4.11-r0 apk
|
||||
php84-mysqlnd 8.4.11-r0 apk
|
||||
php84-opcache 8.4.11-r0 apk
|
||||
php84-openssl 8.4.11-r0 apk
|
||||
php84-pcntl 8.4.11-r0 apk
|
||||
php84-pdo 8.4.11-r0 apk
|
||||
php84-pdo_mysql 8.4.11-r0 apk
|
||||
php84-pdo_pgsql 8.4.11-r0 apk
|
||||
php84-pdo_sqlite 8.4.11-r0 apk
|
||||
php84-pecl-apcu 5.1.26-r0 apk
|
||||
php84 8.4.13-r0 apk
|
||||
php84-bcmath 8.4.13-r0 apk
|
||||
php84-bz2 8.4.13-r0 apk
|
||||
php84-common 8.4.13-r0 apk
|
||||
php84-ctype 8.4.13-r0 apk
|
||||
php84-curl 8.4.13-r0 apk
|
||||
php84-dom 8.4.13-r0 apk
|
||||
php84-exif 8.4.13-r0 apk
|
||||
php84-fileinfo 8.4.13-r0 apk
|
||||
php84-fpm 8.4.13-r0 apk
|
||||
php84-ftp 8.4.13-r0 apk
|
||||
php84-gd 8.4.13-r0 apk
|
||||
php84-gmp 8.4.13-r0 apk
|
||||
php84-iconv 8.4.13-r0 apk
|
||||
php84-intl 8.4.13-r0 apk
|
||||
php84-ldap 8.4.13-r0 apk
|
||||
php84-mbstring 8.4.13-r0 apk
|
||||
php84-mysqlnd 8.4.13-r0 apk
|
||||
php84-opcache 8.4.13-r0 apk
|
||||
php84-openssl 8.4.13-r0 apk
|
||||
php84-pcntl 8.4.13-r0 apk
|
||||
php84-pdo 8.4.13-r0 apk
|
||||
php84-pdo_mysql 8.4.13-r0 apk
|
||||
php84-pdo_pgsql 8.4.13-r0 apk
|
||||
php84-pdo_sqlite 8.4.13-r0 apk
|
||||
php84-pecl-apcu 5.1.27-r0 apk
|
||||
php84-pecl-igbinary 3.2.16-r1 apk
|
||||
php84-pecl-imagick 3.8.0-r1 apk
|
||||
php84-pecl-imap 1.0.3-r0 apk
|
||||
@@ -363,19 +362,19 @@ php84-pecl-memcached 3.3.0-r0 apk
|
||||
php84-pecl-msgpack 3.0.0-r0 apk
|
||||
php84-pecl-redis 6.2.0-r0 apk
|
||||
php84-pecl-smbclient 1.2.0_pre-r0 apk
|
||||
php84-pgsql 8.4.11-r0 apk
|
||||
php84-phar 8.4.11-r0 apk
|
||||
php84-posix 8.4.11-r0 apk
|
||||
php84-session 8.4.11-r0 apk
|
||||
php84-simplexml 8.4.11-r0 apk
|
||||
php84-sockets 8.4.11-r0 apk
|
||||
php84-sodium 8.4.11-r0 apk
|
||||
php84-sqlite3 8.4.11-r0 apk
|
||||
php84-sysvsem 8.4.11-r0 apk
|
||||
php84-xml 8.4.11-r0 apk
|
||||
php84-xmlreader 8.4.11-r0 apk
|
||||
php84-xmlwriter 8.4.11-r0 apk
|
||||
php84-zip 8.4.11-r0 apk
|
||||
php84-pgsql 8.4.13-r0 apk
|
||||
php84-phar 8.4.13-r0 apk
|
||||
php84-posix 8.4.13-r0 apk
|
||||
php84-session 8.4.13-r0 apk
|
||||
php84-simplexml 8.4.13-r0 apk
|
||||
php84-sockets 8.4.13-r0 apk
|
||||
php84-sodium 8.4.13-r0 apk
|
||||
php84-sqlite3 8.4.13-r0 apk
|
||||
php84-sysvsem 8.4.13-r0 apk
|
||||
php84-xml 8.4.13-r0 apk
|
||||
php84-xmlreader 8.4.13-r0 apk
|
||||
php84-xmlwriter 8.4.13-r0 apk
|
||||
php84-zip 8.4.13-r0 apk
|
||||
phpdocumentor/reflection-common 2.2.0 php-composer
|
||||
phpdocumentor/reflection-docblock 5.4.1 php-composer
|
||||
phpdocumentor/type-resolver 1.8.2 php-composer
|
||||
@@ -412,7 +411,7 @@ rand 0.8.5 rust-crate
|
||||
rand_chacha 0.3.1 rust-crate
|
||||
rand_core 0.6.4 rust-crate
|
||||
rav1e 0.7.1 rust-crate
|
||||
rav1e-libs 0.7.1-r0 apk
|
||||
rav1e-libs 0.7.1-r2 apk
|
||||
rayon 1.8.0 rust-crate
|
||||
rayon-core 1.12.0 rust-crate
|
||||
readline 8.2.13-r1 apk
|
||||
|
||||
@@ -10,7 +10,7 @@ mkdir -p \
|
||||
/data
|
||||
|
||||
# migrate legacy install (copy inside container)
|
||||
if [ -f /config/www/nextcloud/version.php ]; then
|
||||
if [[ -f /config/www/nextcloud/version.php ]]; then
|
||||
echo "Migrating legacy install (this can take a while) ...)"
|
||||
rsync -rlD --remove-source-files --exclude-from=/app/upgrade.exclude /config/www/nextcloud/ /app/www/public/
|
||||
rm -rf /config/www/nextcloud/updater/
|
||||
@@ -26,7 +26,7 @@ fi
|
||||
|
||||
# symlink config folders
|
||||
for dir in apps config themes; do
|
||||
if [ "$(readlink /app/www/public/${dir})" != "/config/www/nextcloud/${dir}" ]; then
|
||||
if [[ "$(readlink /app/www/public/${dir})" != "/config/www/nextcloud/${dir}" ]]; then
|
||||
rm -rf "/app/www/public/${dir}"
|
||||
ln -s "/config/www/nextcloud/${dir}" "/app/www/public/${dir}"
|
||||
lsiown abc:abc "/config/www/nextcloud/${dir}" "/app/www/public/${dir}"
|
||||
@@ -34,9 +34,9 @@ for dir in apps config themes; do
|
||||
done
|
||||
|
||||
# get versions
|
||||
image_version=$(php -r "require '/app/www/src/version.php'; echo implode('.', \$OC_Version);" 2>/dev/null)
|
||||
installed_version=$(php -r "require '/config/www/nextcloud/config/config.php'; echo \$CONFIG['version'];" 2>/dev/null)
|
||||
if [ "${installed_version}" = "" ]; then
|
||||
image_version=$(php -r "require '/app/www/src/version.php'; echo implode('.', \$OC_Version);" 2>/dev/null | xargs)
|
||||
installed_version=$(php -r "require '/config/www/nextcloud/config/config.php'; echo \$CONFIG['version'];" 2>/dev/null | xargs)
|
||||
if [[ "${installed_version}" = "" ]]; then
|
||||
installed_version="0.0.0.0"
|
||||
fi
|
||||
image_major="${image_version%%.*}"
|
||||
@@ -54,23 +54,23 @@ if vergt "${installed_version}" "${image_version}"; then
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
if [ "${installed_version}" != "0.0.0.0" ] && vergt "${image_major}" "${max_upgrade}"; then
|
||||
if [[ "${installed_version}" != "0.0.0.0" ]] && vergt "${image_major}" "${max_upgrade}"; then
|
||||
echo "Can't start Nextcloud because the version of the data (${installed_version}) is more than one major version behind the docker image version (${image_version}) and upgrading more than one major version is not supported. Please run an image tagged for the major version ${max_upgrade} first."
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
if [ "${installed_version}" = "0.0.0.0" ] || [ ! -f /app/www/public/version.php ] || [ -z "$(ls -A /config/www/nextcloud/apps 2>/dev/null)" ]; then
|
||||
if [[ "${installed_version}" = "0.0.0.0" ]] || [[ ! -f /app/www/public/version.php ]] || [[ -z "$(ls -A /config/www/nextcloud/apps 2>/dev/null)" ]]; then
|
||||
touch /tmp/needs_install
|
||||
fi
|
||||
|
||||
if [ "${installed_version}" != "0.0.0.0" ] && vergt "${image_version}" "${installed_version}"; then
|
||||
if [[ "${installed_version}" != "0.0.0.0" ]] && vergt "${image_version}" "${installed_version}"; then
|
||||
touch /tmp/needs_upgrade
|
||||
fi
|
||||
|
||||
# initialize nextcloud
|
||||
if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_install ] || [ -f /tmp/needs_upgrade ]; then
|
||||
if [[ -f /config/www/nextcloud/config/needs_migration ]] || [[ -f /tmp/needs_install ]] || [[ -f /tmp/needs_upgrade ]]; then
|
||||
echo "Initializing nextcloud ${image_version} (this can take a while) ..."
|
||||
if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then
|
||||
if [[ -f /config/www/nextcloud/config/needs_migration ]] || [[ -f /tmp/needs_upgrade ]]; then
|
||||
echo "Upgrading nextcloud from ${installed_version} ..."
|
||||
shippedApps=$(jq -r .shippedApps[] /app/www/src/core/shipped.json)
|
||||
for app in ${shippedApps}; do
|
||||
@@ -80,11 +80,11 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal
|
||||
|
||||
rsync -rlD --exclude-from=/app/upgrade.exclude /app/www/src/ /app/www/public/
|
||||
for dir in apps config themes; do
|
||||
if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ] || [ -z "$(ls -A /app/www/public/${dir} 2>/dev/null)" ]; then
|
||||
if [[ -f /config/www/nextcloud/config/needs_migration ]] || [[ -f /tmp/needs_upgrade ]] || [[ -z "$(ls -A /app/www/public/${dir} 2>/dev/null)" ]]; then
|
||||
rsync -rlD --include "/${dir}" --exclude '/*' /app/www/src/ /config/www/nextcloud/
|
||||
fi
|
||||
done
|
||||
if [ -z "$(ls -A /data/ 2>/dev/null)" ]; then
|
||||
if [[ -z "$(ls -A /data/ 2>/dev/null)" ]]; then
|
||||
rsync -rlD --include "/data" --exclude '/*' /app/www/src/ /
|
||||
fi
|
||||
|
||||
@@ -94,11 +94,11 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal
|
||||
/app/www/public \
|
||||
/config/www/nextcloud
|
||||
|
||||
if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then
|
||||
if [[ -f /config/www/nextcloud/config/needs_migration ]] || [[ -f /tmp/needs_upgrade ]]; then
|
||||
# Upgrade
|
||||
occ upgrade
|
||||
else
|
||||
if [ "${installed_version}" = "0.0.0.0" ]; then
|
||||
if [[ "${installed_version}" = "0.0.0.0" ]]; then
|
||||
# Install
|
||||
echo "New nextcloud instance"
|
||||
echo "Please run the web-based installer on first connect!"
|
||||
@@ -148,14 +148,14 @@ for APP in richdocumentscode; do
|
||||
echo "Removing ${APP}"
|
||||
fi
|
||||
APP_PATH=$(occ app:getpath "${APP}" 2>/dev/null)
|
||||
if [ -z "${APP_PATH}" ] || [ ! -d "${APP_PATH}" ]; then
|
||||
if [[ -z "${APP_PATH}" ]] || [[ ! -d "${APP_PATH}" ]]; then
|
||||
APP_PATH="/app/www/public/apps/${APP}"
|
||||
fi
|
||||
if [ -d "${APP_PATH}" ]; then
|
||||
if [[ -d "${APP_PATH}" ]]; then
|
||||
occ app:disable "${APP}" >/dev/null 2>&1
|
||||
fi
|
||||
APP_STATUS="$(occ config:app:get "${APP}" enabled 2>/dev/null)"
|
||||
if [ "${APP_STATUS}" != "no" ] && [ -n "${APP_STATUS}" ]; then
|
||||
if [[ "${APP_STATUS}" != "no" ]] && [[ -n "${APP_STATUS}" ]]; then
|
||||
occ config:app:set "${APP}" enabled --value="no" >/dev/null 2>&1
|
||||
fi
|
||||
occ app:remove "${APP}" >/dev/null 2>&1
|
||||
@@ -163,14 +163,14 @@ for APP in richdocumentscode; do
|
||||
done
|
||||
|
||||
# set data directory
|
||||
if [ ! -s /config/www/nextcloud/config/config.php ]; then
|
||||
if [[ ! -s /config/www/nextcloud/config/config.php ]]; then
|
||||
echo -e "<?php\n\$CONFIG = array (\n 'datadirectory' => '/data',\n);" >/config/www/nextcloud/config/config.php
|
||||
elif [ -f /config/www/nextcloud/config/config.php ]; then
|
||||
elif [[ -f /config/www/nextcloud/config/config.php ]]; then
|
||||
sed -i "s|/app/www/public/data|/data|g" /config/www/nextcloud/config/config.php
|
||||
fi
|
||||
|
||||
#modify javascript mime type and add .mjs support
|
||||
if [ -s /etc/nginx/mime.types ]; then
|
||||
if [[ -s /etc/nginx/mime.types ]]; then
|
||||
sed -i 's|\bjs;|js mjs;|g' /etc/nginx/mime.types
|
||||
sed -i 's|\bapplication/javascript|text/javascript|g' /etc/nginx/mime.types
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user