Skip to content

Commit e938e85

Browse files
authored
fix: add missing && \ in Dockerfile (#3594)
* fix: add missing && \ in Dockerfile * fixup: add goboring after PATH goboring
1 parent 985eea6 commit e938e85

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

dogfood/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN mkdir --parents "$GOPATH" && \
6666
go install github.com/dvyukov/go-fuzz/go-fuzz-build@latest && \
6767
# go-releaser for building 'fat binaries' that work cross-platform
6868
go install github.com/goreleaser/goreleaser@v1.6.1 && \
69-
go install mvdan.cc/sh/v3/cmd/shfmt@latest
69+
go install mvdan.cc/sh/v3/cmd/shfmt@latest && \
7070
# nfpm is used with `make build` to make release packages
7171
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.16.0
7272

@@ -177,9 +177,6 @@ RUN apt-get update && \
177177
RUN update-alternatives --install /usr/local/bin/initdb initdb /usr/lib/postgresql/11/bin/initdb 100 && \
178178
update-alternatives --install /usr/local/bin/postgres postgres /usr/lib/postgresql/11/bin/postgres 100
179179

180-
# Ensure goboring is made the default Go
181-
RUN update-alternatives --install /usr/local/bin/gofmt gofmt /usr/local/goboring/bin/gofmt 100
182-
183180
# Create links for injected dependencies
184181
RUN ln --symbolic /var/tmp/coder/coder-cli/coder /usr/local/bin/coder && \
185182
ln --symbolic /var/tmp/coder/code-server/bin/code-server /usr/local/bin/code-server
@@ -299,6 +296,9 @@ RUN mkdir /usr/local/goboring && \
299296

300297
ENV PATH=$PATH:/usr/local/goboring/bin
301298

299+
# Ensure goboring is made the default Go
300+
RUN update-alternatives --install /usr/local/bin/gofmt gofmt /usr/local/goboring/bin/gofmt 100
301+
302302
COPY --from=go /tmp/bin /usr/local/bin
303303

304304
COPY --from=rust-utils /tmp/bin /usr/local/bin

0 commit comments

Comments
 (0)