webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build_docker.sh, Dockerfile: fix bug with shell quoting

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+11 -3
View File
@@ -49,10 +49,18 @@ RUN go mod download
COPY . .
# see build_docker.sh
ARG goflags_arg=""
ENV GOFLAGS=$goflags_arg
ARG VERSION_LONG=""
ENV VERSION_LONG=$VERSION_LONG
ARG VERSION_SHORT=""
ENV VERSION_SHORT=$VERSION_SHORT
ARG VERSION_GIT_HASH=""
ENV VERSION_GIT_HASH=$VERSION_GIT_HASH
RUN go install -v ./cmd/...
RUN go install -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" \
-v ./cmd/...
FROM alpine:3.11
RUN apk add --no-cache ca-certificates iptables iproute2