Skip to content

fix: add missing && \ in Dockerfile #3594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2022
Merged

fix: add missing && \ in Dockerfile #3594

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2798bd4
fix: add missing && \ in Dockerfile
jsjoeio Aug 19, 2022
8ffb579
fixup: add goboring after PATH goboring
jsjoeio Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dogfood/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down