Skip to content

Commit a03e71d

Browse files
committed
various: upgrade to go 1.23 containers
Upgrade to use go 1.23 images in various files that specify docker containers to run. Change-Id: I6331a07c4d0f00dc7513a5286d315dd0f64cd362 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/606778 Reviewed-by: Robert Findley <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> kokoro-CI: kokoro <[email protected]>
1 parent da7af58 commit a03e71d

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

deploy/deploy-env.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
args:
2323
- $PROJECT_ID
2424
- id: Check redistributable
25-
name: golang:1.22rc1
25+
name: golang:1.23
2626
entrypoint: private/devtools/check_redist.sh
2727
- id: Build
2828
name: gcr.io/cloud-builders/docker
@@ -48,7 +48,7 @@ steps:
4848
- -c
4949
- deploy/frontend.sh $_ENV gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
5050
- id: Pagecheck
51-
name: golang:1.22rc1
51+
name: golang:1.23
5252
entrypoint: deploy/pagecheck.sh
5353
args:
5454
- $_ENV

deploy/deploy.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
args:
2323
- $PROJECT_ID
2424
- id: Check redistributable
25-
name: golang:1.22rc1
25+
name: golang:1.23
2626
entrypoint: private/devtools/check_redist.sh
2727
- id: Build
2828
name: gcr.io/cloud-builders/docker
@@ -48,7 +48,7 @@ steps:
4848
- -c
4949
- deploy/frontend.sh staging gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
5050
- id: Pagecheck - staging
51-
name: golang:1.22rc1
51+
name: golang:1.23
5252
entrypoint: deploy/pagecheck.sh
5353
args:
5454
- staging
@@ -77,7 +77,7 @@ steps:
7777
- -c
7878
- deploy/frontend.sh prod gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
7979
- id: Pagecheck - prod
80-
name: golang:1.22rc1
80+
name: golang:1.23
8181
entrypoint: deploy/pagecheck.sh
8282
args:
8383
- prod
@@ -88,7 +88,7 @@ steps:
8888
- -c
8989
- deploy/frontend.sh beta gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
9090
- id: Pagecheck - beta
91-
name: golang:1.22rc1
91+
name: golang:1.23
9292
entrypoint: deploy/pagecheck.sh
9393
args:
9494
- beta

deploy/migrate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ steps:
1616
args:
1717
- $PROJECT_ID
1818
- id: Migrate
19-
name: golang:1.22rc1
19+
name: golang:1.23
2020
entrypoint: bash
2121
dir: private
2222
args:

deploy/sitemap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ steps:
99
args:
1010
- $PROJECT_ID
1111
- id: Build
12-
name: golang:1.22rc1
12+
name: golang:1.23
1313
entrypoint: bash
1414
dir: private
1515
args:

devtools/docker/compose.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Copyright 2021 The Go Authors. All rights reserved.
22
# Use of this source code is governed by a BSD-style
33
# license that can be found in the LICENSE file.
4-
version: '3.4'
54

65
x-database-variables: &database-variables
76
GO_DISCOVERY_DATABASE_HOST: db
@@ -31,7 +30,7 @@ services:
3130
depends_on:
3231
- db
3332
# This should match the version we are using on Cloud Run.
34-
image: golang:1.22rc1
33+
image: golang:1.23
3534
environment:
3635
<<: [*database-variables, *go-variables]
3736
GO_DISCOVERY_TESTDB: ${GO_DISCOVERY_TESTDB:-"true"}
@@ -42,7 +41,7 @@ services:
4241
- ../../:/pkgsite
4342
working_dir: /pkgsite
4443
searchtest:
45-
image: golang:1.22rc1
44+
image: golang:1.23
4645
depends_on:
4746
- frontend
4847
environment:
@@ -53,7 +52,7 @@ services:
5352
- ../../:/pkgsite
5453
working_dir: /pkgsite
5554
api:
56-
image: golang:1.22rc1
55+
image: golang:1.23
5756
depends_on:
5857
- frontend
5958
environment:
@@ -65,7 +64,7 @@ services:
6564
working_dir: /pkgsite
6665
frontend:
6766
# This should match the version we are using on AppEngine.
68-
image: golang:1.22rc1
67+
image: golang:1.23
6968
depends_on:
7069
- db
7170
command: bash -c "
@@ -82,7 +81,7 @@ services:
8281
working_dir: /pkgsite
8382
seeddb:
8483
# This should match the version we are using on Cloud Run.
85-
image: golang:1.22rc1
84+
image: golang:1.23
8685
depends_on:
8786
- db
8887
# Note: technically we should check that migrations have completed before
@@ -135,7 +134,7 @@ services:
135134
shm_size: 8G
136135
go:
137136
# This should match the version we are using on Cloud Run.
138-
image: golang:1.22rc1
137+
image: golang:1.23
139138
entrypoint: go
140139
environment:
141140
<<: [*database-variables, *go-variables]

0 commit comments

Comments
 (0)