From 83ae551cea12c6386123186f4c2770933aad14d3 Mon Sep 17 00:00:00 2001 From: Robert Burke Date: Fri, 13 Sep 2024 11:20:21 -0700 Subject: [PATCH] Update Playground and other location usage of Go to use latest released version by default. (#32444) --- playground/README.md | 2 +- playground/backend/containers/go/build.gradle | 2 +- playground/backend/containers/java/Dockerfile | 2 +- playground/backend/containers/python/Dockerfile | 2 +- playground/backend/containers/python/build.gradle | 2 +- playground/backend/containers/router/Dockerfile | 2 +- playground/backend/containers/router/build.gradle | 2 +- playground/backend/containers/scio/Dockerfile | 2 +- playground/backend/playground_functions/Dockerfile | 2 +- .../infrastructure/cloudbuild/playground_ci_examples.sh | 4 ++-- release/go-licenses/Dockerfile | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/playground/README.md b/playground/README.md index eb6ed3619bca..8f4aff1663f2 100644 --- a/playground/README.md +++ b/playground/README.md @@ -41,7 +41,7 @@ build, test, and deploy the frontend and backend services. > - buf > - sbt -1. Install Go 1.20+ +1. Install Go 1.23+ **Ubuntu 22.04 and newer:** ```shell diff --git a/playground/backend/containers/go/build.gradle b/playground/backend/containers/go/build.gradle index 39d79103d632..04e86eb53d3f 100644 --- a/playground/backend/containers/go/build.gradle +++ b/playground/backend/containers/go/build.gradle @@ -88,7 +88,7 @@ docker { buildArgs( ['BASE_IMAGE' : project.rootProject.hasProperty(["base-image"]) ? project.rootProject["base-image"] : - "golang:1.20-bullseye", + "golang:1-bullseye", 'SDK_TAG' : project.rootProject.hasProperty(["sdk-tag"]) ? project.rootProject["sdk-tag"] : project.rootProject.sdk_version, 'SDK_TAG_LOCAL': project.rootProject.sdk_version, diff --git a/playground/backend/containers/java/Dockerfile b/playground/backend/containers/java/Dockerfile index 18a37f6f016c..161fd3283f7b 100644 --- a/playground/backend/containers/java/Dockerfile +++ b/playground/backend/containers/java/Dockerfile @@ -16,7 +16,7 @@ # limitations under the License. ############################################################################### ARG BEAM_VERSION=2.44.0 -FROM golang:1.20-bullseye AS build +FROM golang:1-bullseye AS build ARG BEAM_VERSION ARG GIT_COMMIT="" ARG GIT_TIMESTAMP="0" diff --git a/playground/backend/containers/python/Dockerfile b/playground/backend/containers/python/Dockerfile index fd7d8b7f8958..dc734fe34d2f 100644 --- a/playground/backend/containers/python/Dockerfile +++ b/playground/backend/containers/python/Dockerfile @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ############################################################################### -ARG GO_BASE_IMAGE=golang:1.20-bullseye +ARG GO_BASE_IMAGE=golang:1-bullseye ARG SDK_TAG ARG BASE_IMAGE=apache/beam_python3.10_sdk:$SDK_TAG FROM $GO_BASE_IMAGE AS build diff --git a/playground/backend/containers/python/build.gradle b/playground/backend/containers/python/build.gradle index 4a845b516b80..cce805f393bf 100644 --- a/playground/backend/containers/python/build.gradle +++ b/playground/backend/containers/python/build.gradle @@ -75,7 +75,7 @@ docker { buildArgs( ['GO_BASE_IMAGE': project.rootProject.hasProperty(["go-base-image"]) ? project.rootProject["go-base-image"] : - "golang:1.20-bullseye", + "golang:1-bullseye", 'SDK_TAG' : project.rootProject.hasProperty(["sdk-tag"]) ? project.rootProject["sdk-tag"] : default_beam_version, 'GIT_COMMIT' : getGitCommitHash(), diff --git a/playground/backend/containers/router/Dockerfile b/playground/backend/containers/router/Dockerfile index 57717d09f8cb..863461013a45 100644 --- a/playground/backend/containers/router/Dockerfile +++ b/playground/backend/containers/router/Dockerfile @@ -16,7 +16,7 @@ # limitations under the License. ############################################################################### #Dokerfile to set up the Beam Go SDK -ARG BASE_IMAGE=golang:1.20-bullseye +ARG BASE_IMAGE=golang:1-bullseye #Two-stage assembly FROM $BASE_IMAGE AS build ARG GIT_COMMIT="" diff --git a/playground/backend/containers/router/build.gradle b/playground/backend/containers/router/build.gradle index 49ae2dc5d401..48dcda7a6899 100644 --- a/playground/backend/containers/router/build.gradle +++ b/playground/backend/containers/router/build.gradle @@ -70,7 +70,7 @@ docker { tags containerImageTags() buildArgs(['BASE_IMAGE' : project.rootProject.hasProperty(["base-image"]) ? project.rootProject["base-image"] : - "golang:1.20-bullseye", + "golang:1-bullseye", 'GIT_COMMIT' : getGitCommitHash(), 'GIT_TIMESTAMP': getGitCommitTimestamp()]) } diff --git a/playground/backend/containers/scio/Dockerfile b/playground/backend/containers/scio/Dockerfile index 8e68404360dc..9c9e0ffa32ed 100644 --- a/playground/backend/containers/scio/Dockerfile +++ b/playground/backend/containers/scio/Dockerfile @@ -16,7 +16,7 @@ # limitations under the License. ############################################################################### ARG BASE_IMAGE=openjdk:11 -FROM golang:1.20-bullseye AS build +FROM golang:1-bullseye AS build ARG GIT_COMMIT="" ARG GIT_TIMESTAMP="0" diff --git a/playground/backend/playground_functions/Dockerfile b/playground/backend/playground_functions/Dockerfile index a4045c021314..3ee2c2bdc046 100644 --- a/playground/backend/playground_functions/Dockerfile +++ b/playground/backend/playground_functions/Dockerfile @@ -18,7 +18,7 @@ # This Dockerfile is only for local testing -FROM golang:1.20-alpine as build +FROM golang:1-alpine as build COPY . /app WORKDIR /app/playground_functions diff --git a/playground/infrastructure/cloudbuild/playground_ci_examples.sh b/playground/infrastructure/cloudbuild/playground_ci_examples.sh index 962d18a0f475..437cc337faf7 100755 --- a/playground/infrastructure/cloudbuild/playground_ci_examples.sh +++ b/playground/infrastructure/cloudbuild/playground_ci_examples.sh @@ -84,7 +84,7 @@ export STEP=CI export SDK_CONFIG="$BEAM_ROOT_DIR/playground/sdks.yaml" export BEAM_EXAMPLE_CATEGORIES="$BEAM_ROOT_DIR/playground/categories.yaml" export GRADLE_VERSION=7.5.1 -export GO_VERSION=1.20 +export GO_VERSION=1.23 LogOutput "Installing python java8 and dependencies" apt-get update > /dev/null @@ -244,4 +244,4 @@ do exit 1 fi done -exit 0 \ No newline at end of file +exit 0 diff --git a/release/go-licenses/Dockerfile b/release/go-licenses/Dockerfile index 1dfddc6e3745..f37b161ab3ed 100644 --- a/release/go-licenses/Dockerfile +++ b/release/go-licenses/Dockerfile @@ -16,7 +16,7 @@ # limitations under the License. ############################################################################### -FROM golang:1.20-bookworm +FROM golang:1-bookworm WORKDIR /usr/src/app COPY go.mod ./