Skip to content

Commit 5682330

Browse files
committed
playground: fix the build for Go 1.14.x
The NaCL patches do not apply to Go 1.14. This should help fix deployments. As a result, NaCL mode is pinned at 1.13.x. In the Dockerfile, GO_VERSION will only apply to the gVisor flow going forward. Further simplifications will be made in a future CL. Updates golang/go#25224 Change-Id: I9241416670646d775ef2c81183eaaf9f1cc42442 Reviewed-on: https://go-review.googlesource.com/c/playground/+/227347 Reviewed-by: Andrew Bonventre <[email protected]>
1 parent fa32453 commit 5682330

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ RUN apt-get update && apt-get install -y ${BUILD_DEPS} --no-install-recommends
1919
ENV GOPATH /go
2020
ENV PATH /usr/local/go/bin:$GOPATH/bin:$PATH
2121
ENV GOROOT_BOOTSTRAP /usr/local/gobootstrap
22-
ENV GO_BOOTSTRAP_VERSION go1.13
23-
ARG GO_VERSION=go1.13
22+
ENV GO_BOOTSTRAP_VERSION go1.13.9
23+
ARG GO_VERSION=go1.14.1
2424
ENV GO_VERSION ${GO_VERSION}
2525

2626
# Fake time
@@ -36,7 +36,7 @@ RUN mkdir -p $GOROOT_BOOTSTRAP
3636
RUN tar --strip=1 -C $GOROOT_BOOTSTRAP -vxzf /tmp/go.tar.gz
3737

3838
# Fetch Go source for tag $GO_VERSION.
39-
RUN git clone --depth=1 --branch=$GO_VERSION https://go.googlesource.com/go /usr/local/go
39+
RUN git clone --depth=1 --branch=$GO_BOOTSTRAP_VERSION https://go.googlesource.com/go /usr/local/go
4040
# Apply the fake time and fake filesystem patches.
4141
RUN patch /usr/local/go/src/runtime/rt0_nacl_amd64p32.s /usr/local/playground/enable-fake-time.patch
4242
RUN cd /usr/local/go && $GOROOT_BOOTSTRAP/bin/go run misc/nacl/mkzip.go -p syscall /usr/local/playground/fake_fs.lst src/syscall/fstest_nacl.go
@@ -74,10 +74,7 @@ FROM golang:1.13 AS temp_pre_go14
7474
ENV BUILD_DEPS 'curl git gcc patch libc6-dev ca-certificates'
7575
RUN apt-get update && apt-get install -y --no-install-recommends ${BUILD_DEPS}
7676

77-
# go1.14beta1:
78-
ENV GO_REV a5bfd9da1d1b24f326399b6b75558ded14514f23
79-
80-
RUN cd /usr/local && git clone https://go.googlesource.com/go go1.14 && cd go1.14 && git reset --hard ${GO_REV}
77+
RUN cd /usr/local && git clone https://go.googlesource.com/go go1.14 && cd go1.14 && git reset --hard $GO_VERSION
8178
WORKDIR /usr/local/go1.14/src
8279
RUN ./make.bash
8380
ENV GOROOT /usr/local/go1.14

0 commit comments

Comments
 (0)