Update Playground and other location usage of Go to use latest releas…

…ed version by default. (#32444)
apache · Sep 13, 2024 · 83ae551 · 83ae551
1 parent 9a524cc
commit 83ae551
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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="<unknown>"
 ARG GIT_TIMESTAMP="0"

diff --git 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
@@ -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
@@ -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="<unknown>"

diff --git 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
@@ -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="<unknown>"
 ARG GIT_TIMESTAMP="0"
 

diff --git 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
@@ -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
+exit 0
diff --git 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 ./