commit 0d85f0110fa2c82035b4ee6bd220e0c13522329f
author Tatiana Bradley <tatianabradley@google.com> Tue Dec 19 14:21:34 2023 -0500
committer Tatiana Bradley <tatianabradley@google.com> Tue Dec 19 20:22:45 2023 +0000
tree dc6e7df416622bb9daf1aca305635532e506294f
parent ba00fcf8c9304465e18285e192bcad9d46e72c05

deploy,cmd/worker: use go1.21 in deploy files

Change-Id: I5b5c9b71f0c8bc1ab37bc92103e8ba0b2abfe9c5
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/551467
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>

cmd/worker/Dockerfile

diff --git a/cmd/worker/Dockerfile b/cmd/worker/Dockerfile
index 24e9a89..268ce1e 100644
--- a/cmd/worker/Dockerfile
+++ b/cmd/worker/Dockerfile
@@ -5,7 +5,7 @@
 # This Dockerfile expects the build context to be the repo root.
 
 ################################################################
-FROM golang:1.19 AS builder
+FROM golang:1.21 AS builder
 # If you change the Go version above, change the FROM line below as well.
 
 # Set the working directory outside $GOPATH to ensure module mode is enabled.
@@ -28,7 +28,7 @@
 RUN go build -mod=readonly ./cmd/worker
 
 ################################################################
-FROM golang:1.19
+FROM golang:1.21
 
 LABEL maintainer="Go VulnDB Team <go-vulndb-team@google.com>"
 

deploy/build.yaml

diff --git a/deploy/build.yaml b/deploy/build.yaml
index 9f884e2..ace5047 100644
--- a/deploy/build.yaml
+++ b/deploy/build.yaml
@@ -1,6 +1,6 @@
 steps:
   - id: Lock
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args:
       - -ec
@@ -23,7 +23,7 @@
         fi
 
   - id: Test
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args:
       - -ec
@@ -37,17 +37,17 @@
       - gsutil -q -m cp -r gs://go-vulndb /workspace
 
   - id: GenerateLegacy
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args: ["-ec", "go run ./cmd/gendb -out /workspace/legacydb -legacy"]
 
   - id: Generate
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args: ["-ec", "go run ./cmd/gendb -out /workspace/db"]
 
   - id: PreValidate
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args:
       - -ec
@@ -66,6 +66,6 @@
       - mkdir /workspace/deployed && gsutil -q -m cp -r gs://go-vulndb /workspace/deployed
 
   - id: PostValidate
-    name: golang:1.19.2
+    name: golang:1.12.5
     entrypoint: bash
     args: ["-ec", "go run ./cmd/checkdb -v1 -legacy /workspace/deployed/go-vulndb"]

deploy/kokoro.sh

diff --git a/deploy/kokoro.sh b/deploy/kokoro.sh
index bfe182b..975240f 100755
--- a/deploy/kokoro.sh
+++ b/deploy/kokoro.sh
@@ -26,6 +26,6 @@
 docker run --rm \
   -v $PWD:/vulndb \
   -w /vulndb \
-  golang:1.17.3 \
+  golang:1.21.5 \
   /bin/bash -c 'go run ./cmd/gendb -repo /vulndb -out new-db &&
                 go run ./cmd/dbdiff old-db new-db'

deploy/worker.yaml

diff --git a/deploy/worker.yaml b/deploy/worker.yaml
index 75f016a..c55fdb6 100644
--- a/deploy/worker.yaml
+++ b/deploy/worker.yaml
@@ -12,7 +12,7 @@
 
 steps:
   - id: Lock
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args:
       - -ec
@@ -25,7 +25,7 @@
           -project $PROJECT_ID -build $BUILD_ID -repo https://go.googlesource.com/vulndb
 
   - id: Test
-    name: golang:1.19.2
+    name: golang:1.21.5
     entrypoint: bash
     args:
       - -ec