diff options
| author | nachoparker <nacho@ownyourbits.com> | 2019-05-11 21:13:19 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2019-05-13 06:31:38 +0300 |
| commit | 3b36dd37527076a56c9812c1cfb0950093ce1d19 (patch) | |
| tree | cc8f337d5f74a1db033d3a324038c42fc301b6d7 /docker/nextcloudpi | |
| parent | d9384817c2a14f0889d30bebb89e40a6cb78217c (diff) | |
build: refactor docker builds
Signed-off-by: nachoparker <nacho@ownyourbits.com>
Diffstat (limited to 'docker/nextcloudpi')
| -rwxr-xr-x | docker/nextcloudpi/000ncp | 25 | ||||
| -rw-r--r-- | docker/nextcloudpi/Dockerfile | 15 |
2 files changed, 34 insertions, 6 deletions
diff --git a/docker/nextcloudpi/000ncp b/docker/nextcloudpi/000ncp new file mode 100755 index 00000000..820eb8cf --- /dev/null +++ b/docker/nextcloudpi/000ncp @@ -0,0 +1,25 @@ +#!/bin/bash + +source /usr/local/etc/library.sh + +# INIT NCP CONFIG (first run) +persistent_cfg /usr/local/etc/ncp-config.d /data/ncp +persistent_cfg /etc/services-enabled.d +persistent_cfg /etc/letsencrypt # persist SSL certificates +persistent_cfg /etc/shadow # persist ncp-web password +persistent_cfg /etc/cron.d +persistent_cfg /etc/cron.daily +persistent_cfg /etc/cron.hourly +persistent_cfg /etc/cron.weekly + +# reset bin if we pull a more recent container +[[ -d /data/bin ]] && { + date_img=$(date "+%s" -r /.docker-image) + date_per=$(date "+%s" -r /data/bin) + [[ $date_img -gt $date_per ]] && { + rm -r /data/bin + } +} +persistent_cfg /usr/local/bin /data/bin + +exit 0 diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 2cfdc4e1..6ff91bb3 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -1,6 +1,10 @@ -FROM ownyourbits/nextcloud-x86 +# syntax=docker/dockerfile:experimental -MAINTAINER Ignacio Núñez Hernanz <nacho@ownyourbits.com> +ARG arch=armhf + +FROM ownyourbits/nextcloud-${arch} + +LABEL maintainer="Ignacio Núñez Hernanz <nacho@ownyourbits.com>" SHELL ["/bin/bash", "-c"] @@ -12,9 +16,9 @@ COPY etc /tmp/ncp-build/etc/ COPY ncp.sh update.sh /tmp/ncp-build/ COPY ncp-web /tmp/ncp-build/ncp-web/ COPY ncp-app /tmp/ncp-build/ncp-app/ -COPY docker-common /tmp/ncp-build/docker-common/ +COPY docker /tmp/ncp-build/docker/ -RUN \ +RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ # make sure we don't accidentally disable first run wizard rm -f ncp-web/{wizard.cfg,ncp-web.cfg}; \ @@ -60,10 +64,9 @@ rm -rf /usr/share/doc/*; \ rm -f /var/log/alternatives.log /var/log/apt/*; \ rm /var/cache/debconf/*-old; -COPY docker-common/nextcloudpi/000ncp /etc/services-enabled.d/ +COPY docker/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 |