diff --git a/golang-sample/Dockerfile b/golang-sample/Dockerfile index 223782a1..cbdcce83 100644 --- a/golang-sample/Dockerfile +++ b/golang-sample/Dockerfile @@ -15,7 +15,7 @@ # Use the offical golang image to create a binary. # This is based on Debian and sets the GOPATH to /go. # https://hub.docker.com/_/golang -FROM golang:1.20-buster as builder +FROM golang:1.24-trixie as builder # Create and change to the app directory. WORKDIR /app @@ -35,7 +35,7 @@ RUN go build -v -o server # Use the official Debian slim image for a lean production container. # https://hub.docker.com/_/debian # https://docs.docker.com/develop/develop-images/multistage-build/#use-multi-stage-builds -FROM debian:buster-slim +FROM debian:trixie-slim RUN set -x && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ ca-certificates && \ rm -rf /var/lib/apt/lists/* diff --git a/golang-sample/cloudbuild.yaml b/golang-sample/cloudbuild.yaml index 8c3d028e..c8cc4015 100644 --- a/golang-sample/cloudbuild.yaml +++ b/golang-sample/cloudbuild.yaml @@ -15,33 +15,33 @@ # [START cloudbuild_go_test_yaml] steps: # Run tests and save to file - - name: golang:1.24 + - name: golang:1.24-trixie entrypoint: /bin/bash - args: + args: - -c - | go install github.com/jstemmer/go-junit-report/v2@latest 2>&1 go test -timeout 1m -v ./... | /go/bin/go-junit-report -set-exit-code -iocopy -out ${SHORT_SHA}_test_log.xml # [END cloudbuild_go_test_yaml] - + # [START cloudbuild_go_image_yaml] # Docker Build - name: 'gcr.io/cloud-builders/docker' - args: ['build', '-t', + args: ['build', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/$_AR_REPO_NAME/myimage:$SHORT_SHA', '.'] # [END cloudbuild_go_image_yaml] - + # [START cloudbuild_go_push_yaml] # Docker push to Google Artifact Registry - name: 'gcr.io/cloud-builders/docker' args: ['push', 'us-central1-docker.pkg.dev/$PROJECT_ID/$_AR_REPO_NAME/myimage:$SHORT_SHA'] # [END cloudbuild_go_push_yaml] - + # [START cloudbuild_go_deploy_yaml] # Deploy to Cloud Run - name: 'gcr.io/cloud-builders/gcloud' - args: ['run', 'deploy', 'helloworld-${SHORT_SHA}', - '--image=us-central1-docker.pkg.dev/$PROJECT_ID/$_AR_REPO_NAME/myimage:$SHORT_SHA', + args: ['run', 'deploy', 'helloworld-${SHORT_SHA}', + '--image=us-central1-docker.pkg.dev/$PROJECT_ID/$_AR_REPO_NAME/myimage:$SHORT_SHA', '--region', 'us-central1', '--platform', 'managed'] # [END cloudbuild_go_deploy_yaml] diff --git a/golang-sample/go.mod b/golang-sample/go.mod index e9c63d54..a6422753 100644 --- a/golang-sample/go.mod +++ b/golang-sample/go.mod @@ -1,3 +1,3 @@ module github.com/GoogleCloudPlatform/cloud-build-samples/golang -go 1.19 +go 1.24 diff --git a/run-example-builddeploy/Dockerfile b/run-example-builddeploy/Dockerfile index f5644158..2a771dd4 100644 --- a/run-example-builddeploy/Dockerfile +++ b/run-example-builddeploy/Dockerfile @@ -15,7 +15,7 @@ # Use the official golang image to create a binary. # This is based on Debian and sets the GOPATH to /go. # https://hub.docker.com/_/golang -FROM golang:1.20-buster as builder +FROM golang:1.24-trixie as builder # Create and change to the app directory. WORKDIR /app @@ -35,7 +35,7 @@ RUN go build -v -o server # Use the official Debian slim image for a lean production container. # https://hub.docker.com/_/debian # https://docs.docker.com/develop/develop-images/multistage-build/#use-multi-stage-builds -FROM debian:buster-slim +FROM debian:trixie-slim RUN set -x && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ ca-certificates && \ rm -rf /var/lib/apt/lists/* diff --git a/run-example-builddeploy/go.mod b/run-example-builddeploy/go.mod index cde749b0..bd0e6072 100644 --- a/run-example-builddeploy/go.mod +++ b/run-example-builddeploy/go.mod @@ -1,3 +1,3 @@ module github.com/GoogleCloudPlatform/cloud-build-samples/run-example-builddeploy -go 1.19 \ No newline at end of file +go 1.24