External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

docker: fix updates from ncp-web

Browse Source
This commit is contained in:
nachoparker 2018-04-10 13:54:07 +02:00
parent 8c8d5b1848
commit 88531273c6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-armhf/nextcloudpi/Dockerfile
View File

@ -13,6 +13,9 @@ RUN \
# mark as image build
touch /.ncp-image; \
# mark as docker image
touch /.docker-image; \
apt-get update; \
apt-get install --no-install-recommends -y wget ca-certificates; \

3
docker/nextcloudpi/Dockerfile
View File

@ -13,6 +13,9 @@ RUN \
# mark as image build
touch /.ncp-image; \
# mark as docker image
touch /.docker-image; \
apt-get update; \
apt-get install --no-install-recommends -y wget ca-certificates; \

8
update.sh
View File

@ -44,7 +44,7 @@ cp etc/library.sh /usr/local/etc/
source /usr/local/etc/library.sh
# prevent installing some apt packages in the docker version
[[ "$DOCKERBUILD" == 1 ]] && {
[[ -f /.docker-image ]] && {
mkdir -p $CONFDIR
for opt in $EXCL_DOCKER; do
touch $CONFDIR/$opt
@ -93,7 +93,7 @@ chown -R www-data:www-data /var/www/ncp-web
chmod 770 /var/www/ncp-web
# remove unwanted packages for the docker version
[[ "$DOCKERBUILD" == 1 ]] && {
[[ -f /.docker-image ]] && {
for opt in $EXCL_DOCKER; do
rm $CONFDIR/$opt
done
@ -108,7 +108,7 @@ done
mkdir -p /var/log/redis
chown redis /var/log/redis
[[ "$DOCKERBUILD" != 1 ]] && {
[[ ! -f /.docker-image ]] && {
# improve dependency of database with automount
sed -i 's|^ExecStartPre=/bin/sleep .*|ExecStartPre=/bin/sleep 20|' /lib/systemd/system/mariadb.service
sed -i 's|^Restart=.*|Restart=on-failure|' /lib/systemd/system/mariadb.service
@ -153,7 +153,7 @@ EOF
chmod +x /etc/cron.weekly/letsencrypt-ncp
}
[[ "$DOCKERBUILD" != 1 ]] && {
[[ ! -f /.docker-image ]] && {
# disable ramlogs if accidentally enabled
grep -q '^ACTIVE_=yes$' "$CONFDIR"/nc-ramlogs.sh || {
systemctl disable log2ram