Merge branch 'main' into mafredri/fix-coderd-metadata-test

mafredri · web-flow · commit f3e72eab282e · 2023-06-09T16:45:36.000+03:00
diff --git a/Makefile b/Makefile
@@ -630,7 +630,7 @@ test-postgres-docker:
 		--name test-postgres-docker \
 		--restart no \
 		--detach \
-		postgres:13 \
+		gcr.io/coder-dev-1/postgres:13 \
 		-c shared_buffers=1GB \
 		-c work_mem=1GB \
 		-c effective_cache_size=1GB \
diff --git a/coderd/database/gen/dump/main.go b/coderd/database/gen/dump/main.go
@@ -68,7 +68,7 @@ func main() {
 			"run",
 			"--rm",
 			"--network=host",
-			fmt.Sprintf("postgres:%d", minimumPostgreSQLVersion),
+			fmt.Sprintf("gcr.io/coder-dev-1/postgres:%d", minimumPostgreSQLVersion),
 		}, cmdArgs...)
 	}
 	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func main() {`
`68`	`68`	`"run",`
`69`	`69`	`"--rm",`
`70`	`70`	`"--network=host",`
`71`		`- fmt.Sprintf("postgres:%d", minimumPostgreSQLVersion),`
	`71`	`+ fmt.Sprintf("gcr.io/coder-dev-1/postgres:%d", minimumPostgreSQLVersion),`
`72`	`72`	`}, cmdArgs...)`
`73`	`73`	`}`
`74`	`74`	`cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec`