luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Passthrough $VERSION explicitly to docker/build.sh

Browse source
This commit is contained in:
Anmol Sethi 2023-02-09 19:23:00 -08:00
parent 749d236a53
commit b6078ed342
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ci/release/build.sh
View file

@ -257,6 +257,7 @@ ARCHIVE=$ARCHIVE \
build_docker() { build_docker() {
if [ -n "${LOCAL-}" ]; then if [ -n "${LOCAL-}" ]; then
sh_c ./ci/release/docker/build.sh \ sh_c ./ci/release/docker/build.sh \
--version="$VERSION" \
${PUSH_DOCKER:+--push} \ ${PUSH_DOCKER:+--push} \
${LATEST_DOCKER:+--latest} ${LATEST_DOCKER:+--latest}
return 0 return 0
@ -264,8 +265,10 @@ build_docker() {
sh_c lockfile_ssh "$CI_D2_LINUX_AMD64" .d2-build-lock sh_c lockfile_ssh "$CI_D2_LINUX_AMD64" .d2-build-lock
sh_c gitsync "$CI_D2_LINUX_AMD64" src/d2 sh_c gitsync "$CI_D2_LINUX_AMD64" src/d2
sh_c ssh "$CI_D2_LINUX_AMD64" "D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \ sh_c ssh "$CI_D2_LINUX_AMD64" \
"D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \
./src/d2/ci/release/docker/build.sh \ ./src/d2/ci/release/docker/build.sh \
--version="$VERSION" \
${PUSH_DOCKER:+--push} \ ${PUSH_DOCKER:+--push} \
${LATEST_DOCKER:+--latest} ${LATEST_DOCKER:+--latest}
} }

6
ci/release/docker/build.sh
View file

@ -6,7 +6,7 @@ cd -- "$(dirname "$0")/../../.."
help() { help() {
cat <<EOF cat <<EOF
usage: $0 [-p|--push] [--latest] [ usage: $0 [-p|--push] [--latest] [--version=str]
EOF EOF
} }
@ -25,6 +25,10 @@ main() {
flag_noarg && shift "$FLAGSHIFT" flag_noarg && shift "$FLAGSHIFT"
LATEST=1 LATEST=1
;; ;;
version)
flag_reqarg && shift "$FLAGSHIFT"
VERSION=$FLAGARG
;;
*) *)
flag_errusage "unrecognized flag $FLAGRAW" flag_errusage "unrecognized flag $FLAGRAW"
;; ;;