mirror of
https://github.com/nextcloud/docker.git
synced 2024-11-05 22:04:58 +01:00
Copy config, data, custom_apps, and themes to volume when empty
When Nextcloud performs an upgrade or clean installation,
it will check whether /var/www/html/{config,data,custom_apps,themes} exist.
If not, it will copy
/usr/src/nextcloud/{config,data,custom_apps,themes} to /var/www/html.
This leads to a problem: If those subdirectories are existent but
empty, it will not do the copy. This situation is common when you mount
volumes to those subdirectories, like:
```
version: "2.1"
services:
app:
image: nextcloud:12-apache
volumes:
- nextcloud:/var/www/html:Z
- nextcloud-custom_apps:/var/www/html/custom_apps:Z
- nextcloud-config:/var/www/html/config:Z
- nextcloud-data:/var/www/html/data:Z
- nextcloud-themes:/var/www/html/themes:Z
ports:
- 8080:80/tcp
db:
image: mariadb
volumes:
- db:/var/lib/mysql:Z
environment:
MYSQL_USER: nextcloud
MYSQL_DATABASE: nextcloud
MYSQL_PASSWORD: nextcloud
MYSQL_ROOT_PASSWORD: nextcloud
volumes:
nextcloud:
nextcloud-custom_apps:
nextcloud-config:
nextcloud-data:
nextcloud-themes:
db:
```
This patch will fix this issue by copying to those subdirectories when they
are empty.
This commit is contained in:
Yuxiang Zhu
parent
af7965154e
commit
8e8f33ef46
7 changed files with 84 additions and 126 deletions
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ function version_greater() {
|
|||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
|
||||
}
|
||||
|
||||
# return true if specified directory is empty
|
||||
function directory_empty() {
|
||||
[ -n "$(find "$1"/ -prune -empty)" ]
|
||||
}
|
||||
|
||||
|
||||
installed_version="0.0.0~unknown"
|
||||
if [ -f /var/www/html/version.php ]; then
|
||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
||||
|
|
@ -21,25 +27,13 @@ if version_greater "$image_version" "$installed_version"; then
|
|||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
|
||||
fi
|
||||
|
||||
rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
|
||||
|
||||
if [ ! -d /var/www/html/config ]; then
|
||||
cp -arT /usr/src/nextcloud/config /var/www/html/config
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/data ]; then
|
||||
cp -arT /usr/src/nextcloud/data /var/www/html/data
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/custom_apps ]; then
|
||||
cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps
|
||||
cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/html/themes ]; then
|
||||
cp -arT /usr/src/nextcloud/themes /var/www/html/themes
|
||||
fi
|
||||
|
||||
for dir in config data custom_apps themes; do
|
||||
if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then
|
||||
cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$installed_version" != "0.0.0~unknown" ]; then
|
||||
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
|
||||
|
|
|
|||
Loading…
Reference in a new issue