diff --git a/Makefile b/Makefile index 4cf8c02cf7..9da0e423aa 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,8 @@ DOCKER_ENVS := \ -e NO_PROXY \ -e http_proxy \ -e https_proxy \ - -e no_proxy + -e no_proxy \ + -e VERSION # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds # to allow `make BIND_DIR=. shell` or `make BIND_DIR= test` diff --git a/hack/make.sh b/hack/make.sh index 58e0d8cd62..e52ece212b 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -67,7 +67,7 @@ DEFAULT_BUNDLES=( tgz ) -VERSION=$(< ./VERSION) +VERSION=${VERSION:-$(< ./VERSION)} ! BUILDTIME=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') if [ "$DOCKER_GITCOMMIT" ]; then GITCOMMIT="$DOCKER_GITCOMMIT"