Dockerfile, install.sh: Prevent errors on target systems where nc-datadir is not available

Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index a830deef..7d9351a0 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -144,6 +144,7 @@ COPY ncp-previewgenerator          /tmp/ncp-build/ncp-previewgenerator/
 COPY build/docker                  /tmp/ncp-build/build/docker/
 COPY ncp.sh update.sh post-inst.sh /tmp/ncp-build/
 COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/nc-init-copy.cfg
+COPY etc/ncp-config.d/nc-datadir.cfg /usr/local/etc/ncp-config.d/nc-datadir.cfg
 
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
 set -e; \
@@ -172,6 +173,8 @@ mkdir -p /opt/ncdata \
 set_app_param nc-datadir.sh DATADIR '/data-ro/ncdata' \
 run_app_unsafe bin/ncp/CONFIG/nc-datadir.sh \
 set_app_param nc-datadir.sh DATADIR '/data/ncdata' \
+# Remove nc-datadir.cfg as it's disabled in docker
+rm /usr/local/etc/nc-datadir.cfg \
 sed -i 's|data-ro|data|' /data-ro/nextcloud/config/config.php; \
 
 # fix default paths
diff --git a/install.sh b/install.sh
index f400c04f..f3c160cc 100644
--- a/install.sh
+++ b/install.sh
@@ -69,8 +69,11 @@ install_app    ncp.sh
 run_app_unsafe bin/ncp/CONFIG/nc-init.sh
 echo 'Moving data directory to a more sensible location'
 mkdir -p /opt/ncdata
-set_app_param nc-datadir.sh DATADIR '/opt/ncdata'
-run_app_unsafe bin/ncp/CONFIG/nc-datadir.sh
+(
+  export CFGDIR=etc/ncp-config.d
+  set_app_param nc-datadir.sh DATADIR '/opt/ncdata'
+  run_app_unsafe bin/ncp/CONFIG/nc-datadir.sh
+)
 rm /.ncp-image
 
 # skip on Armbian / Vagrant / LXD ...