Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2018-06-27 09:42:10 +0300
committernachoparker <nacho@ownyourbits.com>2018-06-27 15:08:16 +0300
commit89835cc714dbe0f30e622cad262ee57c09dbfc1f (patch)
tree7b5aa4f901026d774d580d11d9f6c126eed0a088
parent2c01a876c27f372168ffc9760582e58a73edbe3c (diff)
build: fix noip cleanup uninstalls udiskie
-rw-r--r--docker-armhf/nextcloudpi/Dockerfile4
-rw-r--r--docker/nextcloudpi/Dockerfile4
-rw-r--r--etc/ncp-config.d/no-ip.sh4
-rwxr-xr-xupdate.sh2
4 files changed, 12 insertions, 2 deletions
diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile
index 569a9d57..4751fd01 100644
--- a/docker-armhf/nextcloudpi/Dockerfile
+++ b/docker-armhf/nextcloudpi/Dockerfile
@@ -32,6 +32,10 @@ sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \
rm /usr/local/etc/ncp.sh; \
rm /.ncp-image; \
+# should be cleaned up in no-ip.sh, but breaks udiskie.
+# safe to do it here since no automount in docker
+apt-get purge -y make gcc libc-dev; \
+
# cleanup all NCP extras
source /usr/local/etc/library.sh; \
cd /usr/local/etc/ncp-config.d/; \
diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile
index f5d41538..ad77daef 100644
--- a/docker/nextcloudpi/Dockerfile
+++ b/docker/nextcloudpi/Dockerfile
@@ -32,6 +32,10 @@ sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \
rm /usr/local/etc/ncp.sh; \
rm /.ncp-image; \
+# should be cleaned up in no-ip.sh, but breaks udiskie.
+# safe to do it here since no automount in docker
+apt-get purge -y make gcc libc-dev; \
+
# cleanup all NCP extras
source /usr/local/etc/library.sh; \
cd /usr/local/etc/ncp-config.d/; \
diff --git a/etc/ncp-config.d/no-ip.sh b/etc/ncp-config.d/no-ip.sh
index d8351797..509b96a5 100644
--- a/etc/ncp-config.d/no-ip.sh
+++ b/etc/ncp-config.d/no-ip.sh
@@ -102,7 +102,9 @@ configure()
cleanup()
{
- apt-get purge -y make gcc libc-dev
+ # this uninstalls udiskie, commented out
+ # apt-get purge -y make gcc libc-dev
+ :
}
# License
diff --git a/update.sh b/update.sh
index f8c63927..d5d7da87 100755
--- a/update.sh
+++ b/update.sh
@@ -229,7 +229,7 @@ EOF
activate_script nc-autoupdate-nc.sh
cd - &>/dev/null
}
-
+
# change letsencrypt from git to package based
[[ -f /usr/bin/letsencrypt ]] || {
echo "updating letsencrypt..."