Skip to content

Commit

Permalink
various: upgrade to go 1.23 containers
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
jba committed Aug 20, 2024
1 parent da7af58 commit a03e71d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions deploy/deploy-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ steps:
args:
- $PROJECT_ID
- id: Check redistributable
name: golang:1.22rc1
name: golang:1.23
entrypoint: private/devtools/check_redist.sh
- id: Build
name: gcr.io/cloud-builders/docker
Expand All @@ -48,7 +48,7 @@ steps:
- -c
- deploy/frontend.sh $_ENV gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck
name: golang:1.22rc1
name: golang:1.23
entrypoint: deploy/pagecheck.sh
args:
- $_ENV
8 changes: 4 additions & 4 deletions deploy/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ steps:
args:
- $PROJECT_ID
- id: Check redistributable
name: golang:1.22rc1
name: golang:1.23
entrypoint: private/devtools/check_redist.sh
- id: Build
name: gcr.io/cloud-builders/docker
Expand All @@ -48,7 +48,7 @@ steps:
- -c
- deploy/frontend.sh staging gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck - staging
name: golang:1.22rc1
name: golang:1.23
entrypoint: deploy/pagecheck.sh
args:
- staging
Expand Down Expand Up @@ -77,7 +77,7 @@ steps:
- -c
- deploy/frontend.sh prod gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck - prod
name: golang:1.22rc1
name: golang:1.23
entrypoint: deploy/pagecheck.sh
args:
- prod
Expand All @@ -88,7 +88,7 @@ steps:
- -c
- deploy/frontend.sh beta gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck - beta
name: golang:1.22rc1
name: golang:1.23
entrypoint: deploy/pagecheck.sh
args:
- beta
Expand Down
2 changes: 1 addition & 1 deletion deploy/migrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
args:
- $PROJECT_ID
- id: Migrate
name: golang:1.22rc1
name: golang:1.23
entrypoint: bash
dir: private
args:
Expand Down
2 changes: 1 addition & 1 deletion deploy/sitemap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ steps:
args:
- $PROJECT_ID
- id: Build
name: golang:1.22rc1
name: golang:1.23
entrypoint: bash
dir: private
args:
Expand Down
13 changes: 6 additions & 7 deletions devtools/docker/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright 2021 The Go Authors. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
version: '3.4'

x-database-variables: &database-variables
GO_DISCOVERY_DATABASE_HOST: db
Expand Down Expand Up @@ -31,7 +30,7 @@ services:
depends_on:
- db
# This should match the version we are using on Cloud Run.
image: golang:1.22rc1
image: golang:1.23
environment:
<<: [*database-variables, *go-variables]
GO_DISCOVERY_TESTDB: ${GO_DISCOVERY_TESTDB:-"true"}
Expand All @@ -42,7 +41,7 @@ services:
- ../../:/pkgsite
working_dir: /pkgsite
searchtest:
image: golang:1.22rc1
image: golang:1.23
depends_on:
- frontend
environment:
Expand All @@ -53,7 +52,7 @@ services:
- ../../:/pkgsite
working_dir: /pkgsite
api:
image: golang:1.22rc1
image: golang:1.23
depends_on:
- frontend
environment:
Expand All @@ -65,7 +64,7 @@ services:
working_dir: /pkgsite
frontend:
# This should match the version we are using on AppEngine.
image: golang:1.22rc1
image: golang:1.23
depends_on:
- db
command: bash -c "
Expand All @@ -82,7 +81,7 @@ services:
working_dir: /pkgsite
seeddb:
# This should match the version we are using on Cloud Run.
image: golang:1.22rc1
image: golang:1.23
depends_on:
- db
# Note: technically we should check that migrations have completed before
Expand Down Expand Up @@ -135,7 +134,7 @@ services:
shm_size: 8G
go:
# This should match the version we are using on Cloud Run.
image: golang:1.22rc1
image: golang:1.23
entrypoint: go
environment:
<<: [*database-variables, *go-variables]
Expand Down

0 comments on commit a03e71d

Please sign in to comment.