From 929a26d7a5ee2f761066fb2756aa33bd3a26b3ad Mon Sep 17 00:00:00 2001 From: Robert Burke Date: Wed, 2 Aug 2023 09:55:11 -0700 Subject: [PATCH] Update playground to require Go 1.20 to match SDK. (#27757) Co-authored-by: lostluck <13907733+lostluck@users.noreply.github.com> --- 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/go.mod | 2 +- .../playground_components/tools/extract_symbols_go/go.mod | 2 +- playground/infrastructure/cloudbuild/playground_ci_examples.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/playground/README.md b/playground/README.md index ec324a1bb7d2..eb6ed3619bca 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.18+ +1. Install Go 1.20+ **Ubuntu 22.04 and newer:** ```shell diff --git a/playground/backend/containers/go/build.gradle b/playground/backend/containers/go/build.gradle index ee9d82faa5b0..39d79103d632 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.18-bullseye", + "golang:1.20-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 6cd16fab4e7c..3688c435080d 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.18-bullseye AS build +FROM golang:1.20-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 59454b6e97cb..60a76f14f732 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.18-bullseye +ARG GO_BASE_IMAGE=golang:1.20-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 9b11b19b16b7..4a845b516b80 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.18-bullseye", + "golang:1.20-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 2aab1d579fd5..57717d09f8cb 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.18-bullseye +ARG BASE_IMAGE=golang:1.20-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 ad5b5a6b1c49..49ae2dc5d401 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.18-bullseye", + "golang:1.20-bullseye", 'GIT_COMMIT' : getGitCommitHash(), 'GIT_TIMESTAMP': getGitCommitTimestamp()]) } diff --git a/playground/backend/containers/scio/Dockerfile b/playground/backend/containers/scio/Dockerfile index 13bf5f8c494f..ff57f6978b50 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.18-bullseye AS build +FROM golang:1.20-bullseye AS build ARG GIT_COMMIT="" ARG GIT_TIMESTAMP="0" diff --git a/playground/backend/go.mod b/playground/backend/go.mod index b9f9c653a93a..9f5fb433ab7e 100644 --- a/playground/backend/go.mod +++ b/playground/backend/go.mod @@ -15,7 +15,7 @@ module beam.apache.org/playground/backend -go 1.18 +go 1.20 require ( cloud.google.com/go/datastore v1.10.0 diff --git a/playground/frontend/playground_components/tools/extract_symbols_go/go.mod b/playground/frontend/playground_components/tools/extract_symbols_go/go.mod index 3542725fa6ec..eb4d9437f130 100644 --- a/playground/frontend/playground_components/tools/extract_symbols_go/go.mod +++ b/playground/frontend/playground_components/tools/extract_symbols_go/go.mod @@ -15,6 +15,6 @@ module beam.apache.org/playground/extract_symbols_go -go 1.18 +go 1.20 require gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/playground/infrastructure/cloudbuild/playground_ci_examples.sh b/playground/infrastructure/cloudbuild/playground_ci_examples.sh index 6123c6b4fa12..962d18a0f475 100644 --- 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.18 +export GO_VERSION=1.20 LogOutput "Installing python java8 and dependencies" apt-get update > /dev/null