diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 02f94a8f826d2..ad03b25111fe1 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -66,7 +66,7 @@ RUN mkdir --parents "$GOPATH" && \ go install github.com/dvyukov/go-fuzz/go-fuzz-build@latest && \ # go-releaser for building 'fat binaries' that work cross-platform go install github.com/goreleaser/goreleaser@v1.6.1 && \ - go install mvdan.cc/sh/v3/cmd/shfmt@latest + go install mvdan.cc/sh/v3/cmd/shfmt@latest && \ # nfpm is used with `make build` to make release packages go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.16.0 @@ -177,9 +177,6 @@ RUN apt-get update && \ RUN update-alternatives --install /usr/local/bin/initdb initdb /usr/lib/postgresql/11/bin/initdb 100 && \ update-alternatives --install /usr/local/bin/postgres postgres /usr/lib/postgresql/11/bin/postgres 100 -# Ensure goboring is made the default Go -RUN update-alternatives --install /usr/local/bin/gofmt gofmt /usr/local/goboring/bin/gofmt 100 - # Create links for injected dependencies RUN ln --symbolic /var/tmp/coder/coder-cli/coder /usr/local/bin/coder && \ ln --symbolic /var/tmp/coder/code-server/bin/code-server /usr/local/bin/code-server @@ -299,6 +296,9 @@ RUN mkdir /usr/local/goboring && \ ENV PATH=$PATH:/usr/local/goboring/bin +# Ensure goboring is made the default Go +RUN update-alternatives --install /usr/local/bin/gofmt gofmt /usr/local/goboring/bin/gofmt 100 + COPY --from=go /tmp/bin /usr/local/bin COPY --from=rust-utils /tmp/bin /usr/local/bin