From 4c1ea400e59bf4b6cd3ac57982f9d5dbb64e2be3 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 7 Feb 2021 18:22:36 +0100 Subject: [PATCH] simplify build --- contrib/docker/build.sh | 2 +- contrib/docker/update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh index 6754572d..7bd24475 100755 --- a/contrib/docker/build.sh +++ b/contrib/docker/build.sh @@ -13,7 +13,7 @@ for image in $images; do else suffix='' fi - docker build --build-arg "UPLOAD_URL=$UPLOAD_URL" --build-arg "UPLOAD_CREDENTIALS=$UPLOAD_CREDENTIALS" --build-arg "UPLOAD_OS=$image" --build-arg "UPLOAD_ONLY=1" -f $dir/Dockerfile$suffix . + docker build $@ --target build --build-arg "UPLOAD_URL=$UPLOAD_URL" --build-arg "UPLOAD_CREDENTIALS=$UPLOAD_CREDENTIALS" --build-arg "UPLOAD_OS=$image" -f $dir/Dockerfile$suffix . done rm -rf $dir done diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh index 1d0eb9cc..99541738 100755 --- a/contrib/docker/update.sh +++ b/contrib/docker/update.sh @@ -49,7 +49,7 @@ version_variant='' make='./make_all.sh' dir=${1:-release/} if [[ -n "$1" ]]; then - upload_lines='ARG UPLOAD_URL\nARG UPLOAD_CREDENTIALS\nARG UPLOAD_OS\nARG UPLOAD_ONLY\nRUN if [ -n "\$UPLOAD_URL" ] \&\& [ -n "\$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo -n "upload \$img: "; curl -fs -u "\$UPLOAD_CREDENTIALS" -X POST --data-binary "@\$img" -H "Content-Type: application/octet-stream" "\$UPLOAD_URL/\$img?a=\$EBUSD_ARCH\&o=\$UPLOAD_OS\&v=\$EBUSD_VERSION" || echo "failed"; done; if [ -n "\$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi' + upload_lines='ARG UPLOAD_URL\nARG UPLOAD_CREDENTIALS\nARG UPLOAD_OS\nRUN if [ -n "\$UPLOAD_URL" ] \&\& [ -n "\$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo -n "upload \$img: "; curl -fs -u "\$UPLOAD_CREDENTIALS" -X POST --data-binary "@\$img" -H "Content-Type: application/octet-stream" "\$UPLOAD_URL/\$img?a=\$EBUSD_ARCH\&o=\$UPLOAD_OS\&v=\$EBUSD_VERSION" || echo "failed"; done; fi' fi for arch in $archs; do replaceTemplate