build_docker.sh, Dockerfile: fix bug with shell quoting

Fixes #1449

Signed-off-by: Steve Coffman <steve@khanacademy.org>
This commit is contained in:
Steve Coffman
2021-03-05 11:51:27 -05:00
committed by Brad Fitzpatrick
parent 602f92ec30
commit 0d0fad43ed
2 changed files with 16 additions and 5 deletions

View File

@@ -27,5 +27,8 @@ set -eu
eval $(./version/version.sh)
GOFLAGS='-tags xversion -ldflags '"-X tailscale.com/version.Long=${VERSION_LONG} -X tailscale.com/version.Short=${VERSION_SHORT} -X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}"
docker build --build-arg goflags_arg="'""${GOFLAGS}""'" -t tailscale:tailscale .
docker build \
--build-arg VERSION_LONG=$VERSION_LONG \
--build-arg VERSION_SHORT=$VERSION_SHORT \
--build-arg VERSION_GIT_HASH=$VERSION_GIT_HASH \
-t tailscale:tailscale .