Skip to content

Commit f1c3f97

Browse files
broadydmitshur
authored andcommitted
[release-branch.go1.11] cmd/godoc: add missing Dockerfile ARG
Also moves the ARG declarations immediately before they're used to make this omission less likely for future additions. Updates golang/go#28893 Change-Id: Id52a936d978f96d3c629feff69fc9dc4ae1b8463 Reviewed-on: https://go-review.googlesource.com/c/140377 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Reviewed-on: https://go-review.googlesource.com/c/150684
1 parent d297d4d commit f1c3f97

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cmd/godoc/Dockerfile.prod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ RUN go build -o /godoc -tags=golangorg golang.org/x/tools/cmd/godoc
3636
RUN cd /goroot && git clean -xdf
3737

3838
# Add build metadata.
39-
ARG TOOLS_HEAD
40-
ARG TOOLS_CLEAN
41-
ARG DOCKER_TAG
4239
RUN cd /goroot && echo "go repo HEAD: $(git rev-parse HEAD)" >> /goroot/buildinfo
4340
RUN echo "requested go ref: ${GO_REF}" >> /goroot/buildinfo
41+
ARG TOOLS_HEAD
4442
RUN echo "x/tools HEAD: ${TOOLS_HEAD}" >> /goroot/buildinfo
43+
ARG TOOLS_CLEAN
4544
RUN echo "x/tools clean: ${TOOLS_CLEAN}" >> /goroot/buildinfo
45+
ARG DOCKER_TAG
4646
RUN echo "image: ${DOCKER_TAG}" >> /goroot/buildinfo
47+
ARG BUILD_ENV
4748
RUN echo "build env: ${BUILD_ENV}" >> /goroot/buildinfo
4849

4950
RUN rm -rf /goroot/.git

0 commit comments

Comments
 (0)