TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile: fix docker build

Browse Source 
The stamp vars got renamed and I forgot to update these scripts.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2023-02-13 16:56:22 -08:00 committed by Dave Anderson
parent fdc2018d67
commit f9667e4946
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -62,9 +62,9 @@ ENV VERSION_GIT_HASH=$VERSION_GIT_HASH
ARG TARGETARCH ARG TARGETARCH
RUN GOARCH=$TARGETARCH go install -ldflags="\ RUN GOARCH=$TARGETARCH go install -ldflags="\
-X tailscale.com/version.long=$VERSION_LONG \ -X tailscale.com/version.longStamp=$VERSION_LONG \
-X tailscale.com/version.short=$VERSION_SHORT \ -X tailscale.com/version.shortStamp=$VERSION_SHORT \
-X tailscale.com/version.gitCommit=$VERSION_GIT_HASH" \ -X tailscale.com/version.gitCommitStamp=$VERSION_GIT_HASH" \
-v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot -v ./cmd/tailscale ./cmd/tailscaled ./cmd/containerboot
FROM alpine:3.16 FROM alpine:3.16

12
build_docker.sh
View File

@ -43,9 +43,9 @@ case "$TARGET" in
tailscale.com/cmd/tailscaled:/usr/local/bin/tailscaled, \ tailscale.com/cmd/tailscaled:/usr/local/bin/tailscaled, \
tailscale.com/cmd/containerboot:/usr/local/bin/containerboot" \ tailscale.com/cmd/containerboot:/usr/local/bin/containerboot" \
--ldflags="\ --ldflags="\
-X tailscale.com/version.long=${VERSION_LONG} \ -X tailscale.com/version.longStamp=${VERSION_LONG} \
-X tailscale.com/version.short=${VERSION_SHORT} \ -X tailscale.com/version.shortStamp=${VERSION_SHORT} \
-X tailscale.com/version.gitCommit=${VERSION_GIT_HASH}" \ -X tailscale.com/version.gitCommitStamp=${VERSION_GIT_HASH}" \
--base="${BASE}" \ --base="${BASE}" \
--tags="${TAGS}" \ --tags="${TAGS}" \
--repos="${REPOS}" \ --repos="${REPOS}" \
@ -58,9 +58,9 @@ case "$TARGET" in
go run github.com/tailscale/mkctr \ go run github.com/tailscale/mkctr \
--gopaths="tailscale.com/cmd/k8s-operator:/usr/local/bin/operator" \ --gopaths="tailscale.com/cmd/k8s-operator:/usr/local/bin/operator" \
--ldflags="\ --ldflags="\
-X tailscale.com/version.long=${VERSION_LONG} \ -X tailscale.com/version.longStamp=${VERSION_LONG} \
-X tailscale.com/version.short=${VERSION_SHORT} \ -X tailscale.com/version.shortStamp=${VERSION_SHORT} \
-X tailscale.com/version.gitCommit=${VERSION_GIT_HASH}" \ -X tailscale.com/version.gitCommitStamp=${VERSION_GIT_HASH}" \
--base="${BASE}" \ --base="${BASE}" \
--tags="${TAGS}" \ --tags="${TAGS}" \
--repos="${REPOS}" \ --repos="${REPOS}" \