bump base images to 1.21-bullseye and add options to build.gradle

apache · May 31, 2024 · 6b503fd · 6b503fd
1 parent 4f80095
commit 6b503fd
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
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.21-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,8 @@
 # limitations under the License.
 ###############################################################################
 ARG BEAM_VERSION=2.44.0
-FROM golang:1.20-bullseye AS build
+ARG GO_BASE_IMAGE
+FROM $GO_BASE_IMAGE AS build
 ARG BEAM_VERSION
 ARG GIT_COMMIT="<unknown>"
 ARG GIT_TIMESTAMP="0"

diff --git a/playground/backend/containers/java/build.gradle b/playground/backend/containers/java/build.gradle
@@ -74,7 +74,10 @@ docker {
    files "./build/"
    tags containerImageTags()
    buildArgs(
-         ['BEAM_VERSION' : project.rootProject.hasProperty(["sdk-tag"]) ?
+         [  'GO_BASE_IMAGE': project.rootProject.hasProperty(["go-base-image"]) ?
+               project.rootProject["go-base-image"] :
+               "golang:1.21-bullseye",
+            'BEAM_VERSION' : project.rootProject.hasProperty(["sdk-tag"]) ?
                project.rootProject["sdk-tag"] :
                default_beam_version,
           'GIT_COMMIT'   : getGitCommitHash(),

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.21-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
 #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.21-bullseye",
               'GIT_COMMIT'   : getGitCommitHash(),
               'GIT_TIMESTAMP': getGitCommitTimestamp()])
 }

diff --git a/playground/backend/containers/scio/Dockerfile b/playground/backend/containers/scio/Dockerfile
@@ -16,7 +16,8 @@
 # limitations under the License.
 ###############################################################################
 ARG BASE_IMAGE=openjdk:11
-FROM golang:1.20-bullseye AS build
+ARG GO_BASE_IMAGE
+FROM $GO_BASE_IMAGE AS build
 ARG GIT_COMMIT="<unknown>"
 ARG GIT_TIMESTAMP="0"
 

diff --git a/playground/backend/containers/scio/build.gradle b/playground/backend/containers/scio/build.gradle
@@ -69,7 +69,10 @@ docker {
    files "./build/"
    tags containerImageTags()
    buildArgs(
-         ['BASE_IMAGE'   : project.rootProject.hasProperty(["base-image"]) ?
+         [  'GO_BASE_IMAGE': project.rootProject.hasProperty(["go-base-image"]) ?
+               project.rootProject["go-base-image"] :
+               "golang:1.21-bullseye",
+            'BASE_IMAGE'   : project.rootProject.hasProperty(["base-image"]) ?
                project.rootProject["base-image"] :
                "openjdk:11",
           'GIT_COMMIT'   : getGitCommitHash(),