diff options
| author | David Anderson <danderson@tailscale.com> | 2023-02-13 16:56:22 -0800 |
|---|---|---|
| committer | David Anderson <danderson@tailscale.com> | 2023-02-13 16:56:22 -0800 |
| commit | dbd2148b945147a88f12eb59c17a741b7731eba1 (patch) | |
| tree | 64ec4ae73c3c525df4011295708b0c00a6ab7f17 | |
| parent | 5ac12a3e4de95bb30541041ee153db3622f9bda6 (diff) | |
| download | tailscale-danderson/mkversion.tar.xz tailscale-danderson/mkversion.zip | |
Dockerfile: fix docker builddanderson/mkversion
The stamp vars got renamed and I forgot to update these scripts.
Signed-off-by: David Anderson <danderson@tailscale.com>
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rwxr-xr-x | build_docker.sh | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile index e2263f8dc..12df5f5d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,9 +62,9 @@ ENV VERSION_GIT_HASH=$VERSION_GIT_HASH ARG TARGETARCH RUN GOARCH=$TARGETARCH go install -ldflags="\ - -X tailscale.com/version.long=$VERSION_LONG \ - -X tailscale.com/version.short=$VERSION_SHORT \ - -X tailscale.com/version.gitCommit=$VERSION_GIT_HASH" \ + -X tailscale.com/version.longStamp=$VERSION_LONG \ + -X tailscale.com/version.shortStamp=$VERSION_SHORT \ + -X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \ -v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot FROM alpine:3.16 diff --git a/build_docker.sh b/build_docker.sh index ccae6c530..161dfd280 100755 --- a/build_docker.sh +++ b/build_docker.sh @@ -43,9 +43,9 @@ case "$TARGET" in tailscale.com/cmd/tailscaled:/usr/local/bin/tailscaled, \ tailscale.com/cmd/containerboot:/usr/local/bin/containerboot" \ --ldflags="\ - -X tailscale.com/version.long=${VERSION_LONG} \ - -X tailscale.com/version.short=${VERSION_SHORT} \ - -X tailscale.com/version.gitCommit=${VERSION_GIT_HASH}" \ + -X tailscale.com/version.longStamp=${VERSION_LONG} \ + -X tailscale.com/version.shortStamp=${VERSION_SHORT} \ + -X tailscale.com/version.gitCommitStamp=${VERSION_GIT_HASH}" \ --base="${BASE}" \ --tags="${TAGS}" \ --repos="${REPOS}" \ @@ -58,9 +58,9 @@ case "$TARGET" in go run github.com/tailscale/mkctr \ --gopaths="tailscale.com/cmd/k8s-operator:/usr/local/bin/operator" \ --ldflags="\ - -X tailscale.com/version.long=${VERSION_LONG} \ - -X tailscale.com/version.short=${VERSION_SHORT} \ - -X tailscale.com/version.gitCommit=${VERSION_GIT_HASH}" \ + -X tailscale.com/version.longStamp=${VERSION_LONG} \ + -X tailscale.com/version.shortStamp=${VERSION_SHORT} \ + -X tailscale.com/version.gitCommitStamp=${VERSION_GIT_HASH}" \ --base="${BASE}" \ --tags="${TAGS}" \ --repos="${REPOS}" \ |