diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-01-19 07:32:04 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-01-19 08:09:16 +0300 |
| commit | 84ccf94af74d1023b2bc892bcaa24c2c068c6850 (patch) | |
| tree | 8d92430f28505c1f59d4a4a7b0616a2c9a1194be | |
| parent | afa39fb6e7da10abff8e482317b8dadb2923cd63 (diff) | |
docker: fix datadir pathv1.34.6
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | docker/nextcloud/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/nextcloudpi/Dockerfile | 1 | ||||
| -rw-r--r-- | ncp-web/ncp-wait-msg.php | 27 | ||||
| -rw-r--r-- | updates/1.37.0.sh | 2 |
4 files changed, 5 insertions, 29 deletions
diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index f33b431e..dbadbb8e 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -32,7 +32,7 @@ ln -s /data-ro/nextcloud /var/www/nextcloud; \ # stop mysqld mysqladmin -u root shutdown; \ -# package cleanup +# package cleanup apt-get autoremove -y; \ apt-get clean; \ find /var/lib/apt/lists -type f | xargs rm; \ @@ -44,7 +44,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \ # specific cleanup apt-get purge -y wget ca-certificates; \ rm /nc-nextcloud.sh /usr/local/etc/ncp-config.d/nc-nextcloud.cfg; \ -rm /.ncp-image; +rm /.ncp-image; COPY docker/nextcloud/020nextcloud /etc/services-enabled.d/ COPY bin/ncp-provisioning.sh /usr/local/bin/ diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index efc48000..51fad719 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -43,6 +43,7 @@ install_app ncp.sh; \ mv /usr/local/etc/ncp-config.d/nc-init-copy.cfg /usr/local/etc/ncp-config.d/nc-init.cfg; \ run_app_unsafe bin/ncp/CONFIG/nc-init.sh; \ +sed -i 's|data-ro|data|' /data-ro/nextcloud/config/config.php; \ # fix default paths sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.cfg; \ diff --git a/ncp-web/ncp-wait-msg.php b/ncp-web/ncp-wait-msg.php deleted file mode 100644 index c0ba2671..00000000 --- a/ncp-web/ncp-wait-msg.php +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE html> -<html class="ng-csp" data-placeholder-focus="false" lang="en"> -<head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - <meta charset="utf-8"> - <title> NextCloudPi Initialization </title> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="referrer" content="never"> - <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> -<?php session_start(); ?> -</head> -<body id="body-login"> - <div class="wrapper"> - <div class="v-align"> - <header role="banner"> - <div id="header"> - <p style="font-size:130%">Initializing NextCloudPi for the first time</p> - <p style="font-size:130%">Please wait...</p> - </div> - </header> - </div> - </div> - <script type="text/javascript"> - setTimeout( function(){ window.location.reload( true ); }, 5000 ); - </script> -</body> -</html> diff --git a/updates/1.37.0.sh b/updates/1.37.0.sh index f8271b49..c8874c3a 100644 --- a/updates/1.37.0.sh +++ b/updates/1.37.0.sh @@ -20,6 +20,8 @@ rm "${crontab_tmp}" # docker images only [[ -f /.docker-image ]] && { + # fix build bug on v1.32.0 + sed -i 's|data-ro|data|' /data/nextcloud/config/config.php : } |