chore: move all images to new GCP project

deansheather · deansheather · commit 30b088287211 · 2025-06-11T12:27:19.000Z
diff --git a/Makefile b/Makefile
@@ -36,7 +36,9 @@ GOOS         := $(shell go env GOOS)
 GOARCH       := $(shell go env GOARCH)
 GOOS_BIN_EXT := $(if $(filter windows, $(GOOS)),.exe,)
 VERSION      := $(shell ./scripts/version.sh)
-POSTGRES_VERSION ?= 16
+
+POSTGRES_VERSION ?= 17
+POSTGRES_IMAGE   ?= us-docker.pkg.dev/coder-v2-images-public/public/postgres:$(POSTGRES_VERSION)
 
 # Use the highest ZSTD compression level in CI.
 ifdef CI
@@ -949,12 +951,12 @@ test-postgres-docker:
 	docker rm -f test-postgres-docker-${POSTGRES_VERSION} || true
 
 	# Try pulling up to three times to avoid CI flakes.
-	docker pull gcr.io/coder-dev-1/postgres:${POSTGRES_VERSION} || {
+	docker pull ${POSTGRES_IMAGE} || {
 		retries=2
 		for try in $(seq 1 ${retries}); do
 			echo "Failed to pull image, retrying (${try}/${retries})..."
 			sleep 1
-			if docker pull gcr.io/coder-dev-1/postgres:${POSTGRES_VERSION}; then
+			if docker pull ${POSTGRES_IMAGE}; then
 				break
 			fi
 		done
@@ -982,7 +984,7 @@ test-postgres-docker:
 		--restart no \
 		--detach \
 		--memory 16GB \
-		gcr.io/coder-dev-1/postgres:${POSTGRES_VERSION} \
+		${POSTGRES_IMAGE} \
 		-c shared_buffers=2GB \
 		-c effective_cache_size=1GB \
 		-c work_mem=8MB \
diff --git a/coderd/database/dbtestutil/db.go b/coderd/database/dbtestutil/db.go
@@ -298,7 +298,7 @@ func PGDumpSchemaOnly(dbURL string) ([]byte, error) {
 			"run",
 			"--rm",
 			"--network=host",
-			fmt.Sprintf("gcr.io/coder-dev-1/postgres:%d", minimumPostgreSQLVersion),
+			fmt.Sprintf("%s:%d", containerImage, minimumPostgreSQLVersion),
 		}, cmdArgs...)
 	}
 	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec
diff --git a/coderd/database/dbtestutil/postgres.go b/coderd/database/dbtestutil/postgres.go
@@ -26,6 +26,8 @@ import (
 	"github.com/coder/retry"
 )
 
+const containerImage = "us-docker.pkg.dev/coder-v2-images-public/public/postgres"
+
 type ConnectionParams struct {
 	Username string
 	Password string
@@ -379,8 +381,8 @@ func openContainer(t TBSubset, opts DBContainerOptions) (container, func(), erro
 			return container{}, nil, xerrors.Errorf("create tempdir: %w", err)
 		}
 		runOptions := dockertest.RunOptions{
-			Repository: "gcr.io/coder-dev-1/postgres",
-			Tag:        "13",
+			Repository: containerImage,
+			Tag:        strconv.Itoa(minimumPostgreSQLVersion),
 			Env: []string{
 				"POSTGRES_PASSWORD=postgres",
 				"POSTGRES_USER=postgres",
diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile
@@ -87,7 +87,7 @@ RUN apt-get update && \
 	rm -rf /tmp/go/src
 
 # alpine:3.18
-FROM gcr.io/coder-dev-1/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70 AS proto
+FROM us-docker.pkg.dev/coder-v2-images-public/public/alpine@sha256:fd032399cd767f310a1d1274e81cab9f0fd8a49b3589eba2c3420228cd45b6a7 AS proto
 WORKDIR /tmp
 RUN apk add curl unzip
 RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip && \
diff --git a/scaletest/templates/scaletest-runner/Dockerfile b/scaletest/templates/scaletest-runner/Dockerfile
@@ -1,6 +1,6 @@
 # This image is used to run scaletest jobs and, although it is inside
 # the template directory, it is built separately and pushed to
-# gcr.io/coder-dev-1/scaletest-runner:latest.
+# us-docker.pkg.dev/coder-v2-images-public/public/scaletest-runner:latest.
 #
 # Future improvements will include versioning and including the version
 # in the template push.
diff --git a/scaletest/templates/scaletest-runner/main.tf b/scaletest/templates/scaletest-runner/main.tf
@@ -822,7 +822,7 @@ resource "kubernetes_pod" "main" {
 
     container {
       name              = "dev"
-      image             = "gcr.io/coder-dev-1/scaletest-runner:latest"
+      image             = "us-docker.pkg.dev/coder-v2-images-public/public/scaletest-runner:latest"
       image_pull_policy = "Always"
       command           = ["sh", "-c", coder_agent.main.init_script]
       security_context {
diff --git a/site/src/pages/ChatPage/ChatToolInvocation.stories.tsx b/site/src/pages/ChatPage/ChatToolInvocation.stories.tsx
@@ -408,7 +408,7 @@ RUN apt-get update && \
 	rm -rf /tmp/go/src
 
 # alpine:3.18
-FROM gcr.io/coder-dev-1/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70 AS proto
+FROM us-docker.pkg.dev/coder-v2-images-public/public/alpine@sha256:fd032399cd767f310a1d1274e81cab9f0fd8a49b3589eba2c3420228cd45b6a7 AS proto
 WORKDIR /tmp
 RUN apk add curl unzip
 RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip && \

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ func PGDumpSchemaOnly(dbURL string) ([]byte, error) {`
`298`	`298`	`"run",`
`299`	`299`	`"--rm",`
`300`	`300`	`"--network=host",`
`301`		`- fmt.Sprintf("gcr.io/coder-dev-1/postgres:%d", minimumPostgreSQLVersion),`
	`301`	`+ fmt.Sprintf("%s:%d", containerImage, minimumPostgreSQLVersion),`
`302`	`302`	`}, cmdArgs...)`
`303`	`303`	`}`
`304`	`304`	`cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# This image is used to run scaletest jobs and, although it is inside`
`2`	`2`	`# the template directory, it is built separately and pushed to`
`3`		`-# gcr.io/coder-dev-1/scaletest-runner:latest.`
	`3`	`+# us-docker.pkg.dev/coder-v2-images-public/public/scaletest-runner:latest.`
`4`	`4`	`#`
`5`	`5`	`# Future improvements will include versioning and including the version`
`6`	`6`	`# in the template push.`