From 969b9ed91fe761d0d988ece2435ad7e47f29beff Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 27 Jan 2023 17:24:41 -0800 Subject: [PATCH] build_docker.sh: set good repo defaults based on the target. Signed-off-by: David Anderson --- build_docker.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build_docker.sh b/build_docker.sh index 9e88032c0..8c8b48581 100755 --- a/build_docker.sh +++ b/build_docker.sh @@ -23,19 +23,20 @@ set -eu export PATH=$PWD/tool:$PATH eval $(./build_dist.sh shellvars) + +DEFAULT_TARGET="client" DEFAULT_TAGS="v${VERSION_SHORT},v${VERSION_MINOR}" -DEFAULT_REPOS="tailscale/tailscale" DEFAULT_BASE="ghcr.io/tailscale/alpine-base:3.16" -DEFAULT_TARGET="client" PUSH="${PUSH:-false}" -REPOS="${REPOS:-${DEFAULT_REPOS}}" +TARGET="${TARGET:-${DEFAULT_TARGET}}" TAGS="${TAGS:-${DEFAULT_TAGS}}" BASE="${BASE:-${DEFAULT_BASE}}" -TARGET="${TARGET:-${DEFAULT_TARGET}}" case "$TARGET" in client) + DEFAULT_REPOS="tailscale/tailscale" + REPOS="${REPOS:-${DEFAULT_REPOS}}" go run github.com/tailscale/mkctr \ --gopaths="\ tailscale.com/cmd/tailscale:/usr/local/bin/tailscale, \ @@ -52,6 +53,8 @@ case "$TARGET" in /usr/local/bin/containerboot ;; operator) + DEFAULT_REPOS="tailscale/k8s-operator" + REPOS="${REPOS:-${DEFAULT_REPOS}}" go run github.com/tailscale/mkctr \ --gopaths="tailscale.com/cmd/k8s-operator:/usr/local/bin/operator" \ --ldflags="\