From 2798bd4db476e837c00177789c5859702720cfc8 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 19 Aug 2022 08:16:12 -0700 Subject: [PATCH 1/2] fix: add missing && \ in Dockerfile --- dogfood/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 02f94a8f826d2..1fdb8874f96ee 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 From 8ffb5793374b1e509a03f6fc0788e01c55f62be4 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 19 Aug 2022 15:32:06 +0000 Subject: [PATCH 2/2] fixup: add goboring after PATH goboring --- dogfood/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 1fdb8874f96ee..ad03b25111fe1 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -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