From db11336d69190cc9e5918b59408bc67859c2c348 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 17 Jan 2021 19:14:51 +0100 Subject: [PATCH] add support for upload only --- contrib/docker/Dockerfile | 1 + contrib/docker/Dockerfile.arm32v7 | 1 + contrib/docker/Dockerfile.template | 1 + contrib/docker/release/Dockerfile | 3 ++- contrib/docker/update.sh | 3 ++- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index a6e5b3b9..57c8029e 100755 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -17,6 +17,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ ARG UPLOAD_URL ARG UPLOAD_CREDENTIALS +ARG UPLOAD_ONLY diff --git a/contrib/docker/Dockerfile.arm32v7 b/contrib/docker/Dockerfile.arm32v7 index 82984d4f..4434b58f 100644 --- a/contrib/docker/Dockerfile.arm32v7 +++ b/contrib/docker/Dockerfile.arm32v7 @@ -17,6 +17,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ ARG UPLOAD_URL ARG UPLOAD_CREDENTIALS +ARG UPLOAD_ONLY diff --git a/contrib/docker/Dockerfile.template b/contrib/docker/Dockerfile.template index 813175f0..1d908c51 100644 --- a/contrib/docker/Dockerfile.template +++ b/contrib/docker/Dockerfile.template @@ -17,6 +17,7 @@ RUN git clone https://github.com/john30/ebusd.git /build \ ARG UPLOAD_URL ARG UPLOAD_CREDENTIALS +ARG UPLOAD_ONLY %EBUSD_UPLOAD_LINE% diff --git a/contrib/docker/release/Dockerfile b/contrib/docker/release/Dockerfile index f24d714c..6bd77cbb 100755 --- a/contrib/docker/release/Dockerfile +++ b/contrib/docker/release/Dockerfile @@ -17,7 +17,8 @@ RUN git clone https://github.com/john30/ebusd.git /build \ ARG UPLOAD_URL ARG UPLOAD_CREDENTIALS -RUN if [ -n "$UPLOAD_URL" ] && [ -n "$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload $img"; curl -u "$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@$img" -H "Content-Type: application/octet-stream" "$UPLOAD_URL/$img?a=$EBUSD_ARCH&v=$EBUSD_VERSION"; done; fi +ARG UPLOAD_ONLY +RUN if [ -n "$UPLOAD_URL" ] && [ -n "$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload $img"; curl -u "$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@$img" -H "Content-Type: application/octet-stream" "$UPLOAD_URL/$img?a=$EBUSD_ARCH&v=$EBUSD_VERSION"; done; if [ -n "$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi FROM debian:stretch-slim diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh index 5c77f967..387448da 100755 --- a/contrib/docker/update.sh +++ b/contrib/docker/update.sh @@ -46,7 +46,8 @@ done version_variant='' make='./make_all.sh' dir='release/' -upload_line='RUN if [ -n "\$UPLOAD_URL" ] \&\& [ -n "\$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload \$img"; curl -u "\$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@\$img" -H "Content-Type: application/octet-stream" "\$UPLOAD_URL/\$img?a=\$EBUSD_ARCH\&v=\$EBUSD_VERSION"; done; fi' +upload_line='RUN if [ -n "\$UPLOAD_URL" ] \&\& [ -n "\$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload \$img"; curl -u "\$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@\$img" -H "Content-Type: application/octet-stream" "\$UPLOAD_URL/\$img?a=\$EBUSD_ARCH\&v=\$EBUSD_VERSION"; done; if [ -n "\$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi' for arch in $archs; do replaceTemplate done +