2018-03-15 16:55:12 +01:00
#!/bin/sh
set -eu
2016-07-30 16:30:52 +02:00
2017-04-17 22:49:53 +02:00
# version_greater A B returns whether A > B
2018-03-15 16:55:12 +01:00
version_greater( ) {
2018-08-01 23:19:53 +02:00
[ " $( printf '%s\n' " $@ " | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1) " != " $1 " ]
2017-04-17 22:49:53 +02: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.
2017-06-28 08:33:34 +02:00
# return true if specified directory is empty
2018-03-15 16:55:12 +01:00
directory_empty( ) {
[ -z " $( ls -A " $1 / " ) " ]
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.
2017-06-28 08:33:34 +02:00
}
2018-03-15 16:55:12 +01:00
run_as( ) {
2018-08-01 23:19:53 +02:00
if [ " $( id -u) " = 0 ] ; then
su - www-data -s /bin/sh -c " $1 "
else
sh -c " $1 "
fi
2017-07-17 21:35:16 +02: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.
2017-06-28 08:33:34 +02:00
2018-03-15 16:55:12 +01:00
installed_version = "0.0.0.0"
2017-04-17 22:49:53 +02:00
if [ -f /var/www/html/version.php ] ; then
2018-03-15 16:55:12 +01:00
# shellcheck disable=SC2016
installed_version = " $( php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);' ) "
2017-04-17 22:49:53 +02:00
fi
2018-03-15 16:55:12 +01:00
# shellcheck disable=SC2016
image_version = " $( php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);' ) "
2017-04-17 22:49:53 +02:00
if version_greater " $installed_version " " $image_version " ; then
2017-04-19 09:17:59 +02:00
echo " Can't start Nextcloud because the version of the data ( $installed_version ) is higher than the docker image version ( $image_version ) and downgrading is not supported. Are you sure you have pulled the newest image version? "
2017-04-17 22:49:53 +02:00
exit 1
fi
if version_greater " $image_version " " $installed_version " ; then
2018-03-15 16:55:12 +01:00
if [ " $installed_version " != "0.0.0.0" ] ; then
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
2017-07-17 21:35:16 +02:00
fi
2018-03-15 16:55:12 +01:00
if [ " $( id -u) " = 0 ] ; then
2018-08-01 23:19:53 +02:00
rsync_options = "-rlDog --chown www-data:root"
2017-07-17 21:35:16 +02:00
else
2018-08-01 23:19:53 +02:00
rsync_options = "-rlD"
2017-04-17 23:00:56 +02:00
fi
2017-07-17 21:35:16 +02:00
rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
2017-08-10 14:53:11 +02:00
for dir in config data custom_apps themes; do
2018-03-15 16:55:12 +01:00
if [ ! -d " /var/www/html/ $dir " ] || directory_empty " /var/www/html/ $dir " ; then
rsync $rsync_options --include " / $dir / " --exclude '/*' /usr/src/nextcloud/ /var/www/html/
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.
2017-06-28 08:33:34 +02:00
fi
done
2017-05-23 21:12:06 +02:00
2018-03-15 16:55:12 +01:00
if [ " $installed_version " != "0.0.0.0" ] ; then
2017-07-17 21:35:16 +02:00
run_as 'php /var/www/html/occ upgrade --no-app-disable'
2017-04-17 23:00:56 +02:00
2018-03-15 16:55:12 +01:00
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
2017-04-17 23:00:56 +02:00
echo "The following apps have beed disabled:"
2018-03-15 16:55:12 +01:00
diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
2017-04-17 23:00:56 +02:00
rm -f /tmp/list_before /tmp/list_after
2017-04-17 22:57:48 +02:00
fi
2016-07-30 16:30:52 +02:00
fi
exec " $@ "