Skip to content

Commit ae3882a

Browse files
deansheatherdeansheather
authored
chore: move all images to new GCP project (#18324)
1 parent af4a668 commit ae3882a

File tree

10 files changed

+21
-17
lines changed

10 files changed

+21
-17
lines changed

‎.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ jobs:
582582
# NOTE: this could instead be defined as a matrix strategy, but we want to
583583
# only block merging if tests on postgres 13 fail. Using a matrix strategy
584584
# here makes the check in the above `required` job rather complicated.
585-
test-go-pg-16:
585+
test-go-pg-17:
586586
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
587587
needs:
588588
- changes
@@ -613,11 +613,11 @@ jobs:
613613
id: download-cache
614614
uses: ./.github/actions/test-cache/download
615615
with:
616-
key-prefix: test-go-pg-16-${{ runner.os }}-${{ runner.arch }}
616+
key-prefix: test-go-pg-17-${{ runner.os }}-${{ runner.arch }}
617617

618618
- name: Test with PostgreSQL Database
619619
env:
620-
POSTGRES_VERSION: "16"
620+
POSTGRES_VERSION: "17"
621621
TS_DEBUG_DISCO: "true"
622622
TEST_RETRIES: 2
623623
run: |
@@ -719,7 +719,7 @@ jobs:
719719
# c.f. discussion on https://github.com/coder/coder/pull/15106
720720
- name: Run Tests
721721
env:
722-
POSTGRES_VERSION: "16"
722+
POSTGRES_VERSION: "17"
723723
run: |
724724
make test-postgres-docker
725725
DB=ci gotestsum --junitfile="gotests.xml" --packages="./..." --rerun-fails=2 --rerun-fails-abort-on-data-race -- -race -parallel 4 -p 4

‎Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ GOOS := $(shell go env GOOS)
3636
GOARCH := $(shell go env GOARCH)
3737
GOOS_BIN_EXT := $(if $(filter windows, $(GOOS)),.exe,)
3838
VERSION := $(shell ./scripts/version.sh)
39-
POSTGRES_VERSION ?= 16
39+
40+
POSTGRES_VERSION ?= 17
41+
POSTGRES_IMAGE ?= us-docker.pkg.dev/coder-v2-images-public/public/postgres:$(POSTGRES_VERSION)
4042

4143
# Use the highest ZSTD compression level in CI.
4244
ifdef CI
@@ -949,12 +951,12 @@ test-postgres-docker:
949951
docker rm -f test-postgres-docker-${POSTGRES_VERSION} || true
950952

951953
# Try pulling up to three times to avoid CI flakes.
952-
docker pull gcr.io/coder-dev-1/postgres:${POSTGRES_VERSION} || {
954+
docker pull ${POSTGRES_IMAGE} || {
953955
retries=2
954956
for try in $(seq 1 ${retries}); do
955957
echo "Failed to pull image, retrying (${try}/${retries})..."
956958
sleep 1
957-
if docker pull gcr.io/coder-dev-1/postgres:${POSTGRES_VERSION}; then
959+
if docker pull ${POSTGRES_IMAGE}; then
958960
break
959961
fi
960962
done
@@ -982,7 +984,7 @@ test-postgres-docker:
982984
--restart no \
983985
--detach \
984986
--memory 16GB \
985-
gcr.io/coder-dev-1/postgres:${POSTGRES_VERSION} \
987+
${POSTGRES_IMAGE} \
986988
-c shared_buffers=2GB \
987989
-c effective_cache_size=1GB \
988990
-c work_mem=8MB \

‎coderd/database/dbtestutil/db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ func PGDumpSchemaOnly(dbURL string) ([]byte, error) {
298298
"run",
299299
"--rm",
300300
"--network=host",
301-
fmt.Sprintf("gcr.io/coder-dev-1/postgres:%d", minimumPostgreSQLVersion),
301+
fmt.Sprintf("%s:%d", postgresImage, minimumPostgreSQLVersion),
302302
}, cmdArgs...)
303303
}
304304
cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec

‎coderd/database/dbtestutil/postgres.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
"github.com/coder/retry"
2727
)
2828

29+
const postgresImage = "us-docker.pkg.dev/coder-v2-images-public/public/postgres"
30+
2931
type ConnectionParams struct {
3032
Username string
3133
Password string
@@ -379,8 +381,8 @@ func openContainer(t TBSubset, opts DBContainerOptions) (container, func(), erro
379381
return container{}, nil, xerrors.Errorf("create tempdir: %w", err)
380382
}
381383
runOptions := dockertest.RunOptions{
382-
Repository: "gcr.io/coder-dev-1/postgres",
383-
Tag: "13",
384+
Repository: postgresImage,
385+
Tag: strconv.Itoa(minimumPostgreSQLVersion),
384386
Env: []string{
385387
"POSTGRES_PASSWORD=postgres",
386388
"POSTGRES_USER=postgres",

‎docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
database:
3232
# Minimum supported version is 13.
3333
# More versions here: https://hub.docker.com/_/postgres
34-
image: "postgres:16"
34+
image: "postgres:17"
3535
ports:
3636
- "5432:5432"
3737
environment:

‎docs/tutorials/reverse-proxy-caddy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ certificates, you'll need a domain name that resolves to your Caddy server.
3939
condition: service_healthy
4040

4141
database:
42-
image: "postgres:16"
42+
image: "postgres:17"
4343
ports:
4444
- "5432:5432"
4545
environment:

‎dogfood/coder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN apt-get update && \
8787
rm -rf /tmp/go/src
8888

8989
# alpine:3.18
90-
FROM gcr.io/coder-dev-1/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70 AS proto
90+
FROM us-docker.pkg.dev/coder-v2-images-public/public/alpine@sha256:fd032399cd767f310a1d1274e81cab9f0fd8a49b3589eba2c3420228cd45b6a7 AS proto
9191
WORKDIR /tmp
9292
RUN apk add curl unzip
9393
RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip && \

‎scaletest/templates/scaletest-runner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This image is used to run scaletest jobs and, although it is inside
22
# 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.
44
#
55
# Future improvements will include versioning and including the version
66
# in the template push.

‎scaletest/templates/scaletest-runner/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ resource "kubernetes_pod" "main" {
822822

823823
container {
824824
name = "dev"
825-
image = "gcr.io/coder-dev-1/scaletest-runner:latest"
825+
image = "us-docker.pkg.dev/coder-v2-images-public/public/scaletest-runner:latest"
826826
image_pull_policy = "Always"
827827
command = ["sh", "-c", coder_agent.main.init_script]
828828
security_context {

‎site/src/pages/ChatPage/ChatToolInvocation.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ RUN apt-get update && \
408408
rm -rf /tmp/go/src
409409
410410
# alpine:3.18
411-
FROM gcr.io/coder-dev-1/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70 AS proto
411+
FROM us-docker.pkg.dev/coder-v2-images-public/public/alpine@sha256:fd032399cd767f310a1d1274e81cab9f0fd8a49b3589eba2c3420228cd45b6a7 AS proto
412412
WORKDIR /tmp
413413
RUN apk add curl unzip
414414
RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip && \

0 commit comments

Comments
 (0)