From d98d3e869d89ae23fc575125d50abeeb1c60b135 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 21 Mar 2025 18:05:05 +0000 Subject: [PATCH 1/4] chore(dogfood/coder/Dockerfile): revert bump of Go version in dogfood Dockerfile --- dogfood/coder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile index f10c18fbd9809..1f020ac7b4b56 100644 --- a/dogfood/coder/Dockerfile +++ b/dogfood/coder/Dockerfile @@ -9,7 +9,7 @@ RUN cargo install exa bat ripgrep typos-cli watchexec-cli && \ FROM ubuntu:jammy@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS go # Install Go manually, so that we can control the version -ARG GO_VERSION=1.24.1 +ARG GO_VERSION=1.22.8 # Boring Go is needed to build FIPS-compliant binaries. RUN apt-get update && \ From fe48124572087f7c6c100371831a0ee9d7e18f53 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 24 Mar 2025 11:01:55 +0000 Subject: [PATCH 2/4] go1.22.12 --- dogfood/coder/Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile index 1f020ac7b4b56..c9ab45cbc5e6f 100644 --- a/dogfood/coder/Dockerfile +++ b/dogfood/coder/Dockerfile @@ -9,7 +9,7 @@ RUN cargo install exa bat ripgrep typos-cli watchexec-cli && \ FROM ubuntu:jammy@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS go # Install Go manually, so that we can control the version -ARG GO_VERSION=1.22.8 +ARG GO_VERSION=1.22.12 # Boring Go is needed to build FIPS-compliant binaries. RUN apt-get update && \ diff --git a/go.mod b/go.mod index 59b0addf9e454..e555afe0ebf1d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/coder/coder/v2 -go 1.22.9 +go 1.22.12 // Required until a v3 of chroma is created to lazily initialize all XML files. // None of our dependencies seem to use the registries anyways, so this From ab457723d74c1861aada3ea32e205f7c683c7fa5 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 24 Mar 2025 11:57:03 +0000 Subject: [PATCH 3/4] chore(dogfood/coder): install rust deps from apt when possible --- dogfood/coder/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile index c9ab45cbc5e6f..3059bfb4e1400 100644 --- a/dogfood/coder/Dockerfile +++ b/dogfood/coder/Dockerfile @@ -2,7 +2,7 @@ FROM rust:slim@sha256:9abf10cc84dfad6ace1b0aae3951dc5200f467c593394288c11db1e17b # Install rust helper programs # ENV CARGO_NET_GIT_FETCH_WITH_CLI=true ENV CARGO_INSTALL_ROOT=/tmp/ -RUN cargo install exa bat ripgrep typos-cli watchexec-cli && \ +RUN cargo install typos-cli watchexec-cli && \ # Reduce image size. rm -rf /usr/local/cargo/registry @@ -128,6 +128,7 @@ RUN apt-get update --quiet && apt-get install --yes \ asciinema \ bash \ bash-completion \ + bat \ bats \ bind9-dnsutils \ build-essential \ @@ -140,6 +141,7 @@ RUN apt-get update --quiet && apt-get install --yes \ docker-ce \ docker-ce-cli \ docker-compose-plugin \ + exa \ fd-find \ file \ fish \ @@ -176,6 +178,7 @@ RUN apt-get update --quiet && apt-get install --yes \ postgresql-16 \ python3 \ python3-pip \ + ripgrep \ rsync \ screen \ shellcheck \ From d0c9cf8d6998c923064789b83d5c99313773e402 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 24 Mar 2025 11:57:16 +0000 Subject: [PATCH 4/4] chore(dogfood/coder): remove unused go-fuzz dependency --- dogfood/coder/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile index 3059bfb4e1400..9fbc673bcb52b 100644 --- a/dogfood/coder/Dockerfile +++ b/dogfood/coder/Dockerfile @@ -65,9 +65,6 @@ RUN apt-get update && \ # we're using for the version of go-critic that it embeds, then check # the version of ruleguard in go-critic for that tag. go install github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.3.13 && \ - # go-fuzz for fuzzy testing. they don't publish releases so we rely on latest. - go install github.com/dvyukov/go-fuzz/go-fuzz@latest && \ - 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@v3.7.0 && \