diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-05-09 22:45:59 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-05-13 06:49:42 +0300 |
| commit | bd0c23d9f98affa2d12d264f4d8b6f43de0fb453 (patch) | |
| tree | 65e209fba201583adeefc3fc99345f3e19a2037e | |
| parent | 67aa5994d6c91d648465336deea16a697606bfce (diff) | |
build: bail out upon any error in docker builds
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/CONFIG/nc-nextcloud.sh | 2 | ||||
| -rw-r--r-- | docker/lamp/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/nextcloud/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/nextcloudpi/Dockerfile | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/bin/ncp/CONFIG/nc-nextcloud.sh b/bin/ncp/CONFIG/nc-nextcloud.sh index 734a3aaa..7f354b31 100644 --- a/bin/ncp/CONFIG/nc-nextcloud.sh +++ b/bin/ncp/CONFIG/nc-nextcloud.sh @@ -85,7 +85,7 @@ configure() { ## IF BETA SELECTED ADD "pre" to DOWNLOAD PATH [[ "$BETA" == yes ]] && local PREFIX="pre" - + ## DOWNLOAD AND (OVER)WRITE NEXTCLOUD cd /var/www/ diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile index 4023fdb9..41c3b213 100644 --- a/docker/lamp/Dockerfile +++ b/docker/lamp/Dockerfile @@ -13,6 +13,7 @@ ENV DOCKERBUILD 1 COPY etc/ncp.cfg etc/library.sh lamp.sh /usr/local/etc/ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ +set -e; \ # installation apt-get update; \ diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index dbadbb8e..225fef13 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -15,6 +15,7 @@ COPY bin/ncp/CONFIG/nc-nextcloud.sh / COPY etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ +set -e; \ # mark as image build touch /.ncp-image; \ @@ -23,7 +24,6 @@ touch /.ncp-image; \ apt-get update; \ apt-get install --no-install-recommends -y wget ca-certificates sudo jq; \ source /usr/local/etc/library.sh; \ -set +x; \ install_app /nc-nextcloud.sh; \ run_app_unsafe /nc-nextcloud.sh; \ mv /var/www/nextcloud /data-ro/nextcloud; \ diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 51fad719..9667c9da 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -23,6 +23,7 @@ COPY docker /tmp/ncp-build/docker/ COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/nc-init-copy.cfg RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \ +set -e; \ # make sure we don't accidentally disable first run wizard rm -f ncp-web/{wizard.cfg,ncp-web.cfg}; \ |