@@ -16,8 +16,9 @@ RUN curl --silent --show-error --location \
1616"https://storage.googleapis.com/go-boringcrypto/go${GOBORING_VERSION}.linux-amd64.tar.gz" \
1717 -o /usr/local/goboring.tar.gz
1818
19- RUN tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1 && \
20- ln -s /usr/local/goboring/bin/go /usr/local/bin/go
19+ RUN tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1
20+
21+ ENV PATH=$PATH:/usr/local/goboring/bin
2122
2223# Install Go utilities.
2324ARG GOPATH="/tmp/"
@@ -64,7 +65,8 @@ RUN mkdir --parents "$GOPATH" && \
6465 go install github.com/dvyukov/go-fuzz/go-fuzz@latest && \
6566 go install github.com/dvyukov/go-fuzz/go-fuzz-build@latest && \
6667# go-releaser for building 'fat binaries' that work cross-platform
67- go install github.com/goreleaser/goreleaser@v1.6.1
68+ go install github.com/goreleaser/goreleaser@v1.6.1 && \
69+ go install mvdan.cc/sh/v3/cmd/shfmt@latest
6870
6971# Ubuntu 20.04 LTS (Focal Fossa)
7072FROM ubuntu:focal
@@ -243,7 +245,8 @@ RUN curl --silent --show-error --location --output /usr/local/bin/cloud_sql_prox
243245RUN yarn global add --prefix=/usr/local \
244246 vercel \
245247 typescript \
246- typescript-language-server && \
248+ typescript-language-server \
249+ prettier && \
247250 yarn cache clean
248251
249252# We use yq during "make deploy" to manually substitute out fields in
@@ -285,8 +288,10 @@ RUN echo "PermitUserEnvironment yes" >>/etc/ssh/sshd_config && \
285288# are a lot of small files.
286289COPY --from=go /usr/local/goboring.tar.gz /usr/local/goboring.tar.gz
287290RUN mkdir /usr/local/goboring && \
288- tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1 && \
289- ln -s /usr/local/goboring/bin/go /usr/local/bin/go
291+ tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1
292+
293+ ENV PATH=$PATH:/usr/local/goboring/bin
294+
290295COPY --from=go /tmp/bin /usr/local/bin
291296
292297COPY --from=rust-utils /tmp/bin /usr/local/bin