Skip to content

Commit

Permalink
Dockerfile: fix docker build
Browse files Browse the repository at this point in the history
The stamp vars got renamed and I forgot to update these scripts.

Signed-off-by: David Anderson <[email protected]>
  • Loading branch information
danderson committed Feb 14, 2023
1 parent fdc2018 commit f9667e4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand All @@ -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}" \
Expand Down

0 comments on commit f9667e4

Please sign in to comment.