diff options
Diffstat (limited to 'docker/nextcloudpi/Dockerfile')
-rw-r--r-- | docker/nextcloudpi/Dockerfile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 1458cd9d..0583ebc4 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"] ENV DOCKERBUILD 1 RUN mkdir -p /tmp/ncp-build -COPY bin/* /tmp/ncp-build/bin/ +COPY bin/ /tmp/ncp-build/bin/ COPY etc /tmp/ncp-build/etc/ COPY ncp.sh update.sh /tmp/ncp-build/ COPY ncp-web /tmp/ncp-build/ncp-web/ @@ -31,19 +31,18 @@ apt-get install --no-install-recommends -y wget ca-certificates; \ source /usr/local/etc/library.sh; \ set +x; \ cd /tmp/ncp-build/; \ -install_script ncp.sh; \ +install_app ncp.sh; \ # fix default paths -sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.sh; \ +sed -i 's|/media/USBdrive|/data/backups|' /usr/local/etc/ncp-config.d/nc-backup.cfg; \ # specific cleanup -rm -r /tmp/ncp-build; \ +cd /; rm -r /tmp/ncp-build; \ rm /.ncp-image; \ # cleanup all NCP extras source /usr/local/etc/library.sh; \ -cd /usr/local/etc/ncp-config.d/; \ -for script in *.sh; do cleanup_script $script; done; \ +find /usr/local/bin/ncp -name '*.sh' | while read l; do cleanup_script $l; done; \ # should be cleaned up in no-ip.sh, but breaks udiskie. # safe to do it here since no automount in docker @@ -60,6 +59,9 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \ rm /var/cache/debconf/*-old; COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/ +COPY bin/ncp/CONFIG/nc-init.sh / +COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/ + # 4443 - ncp-web EXPOSE 80 443 4443 |