File tree Expand file tree Collapse file tree 3 files changed +6
-3
lines changed
buildSrc/src/main/groovy/org/apache/beam/gradle
sdks/python/expansion-service-container Expand file tree Collapse file tree 3 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -3004,7 +3004,7 @@ class BeamModulePlugin implements Plugin<Project> {
30043004
30053005 // Transform service delivers transforms that refer to SDK harness containers with following sufixes.
30063006 def transformServiceJavaContainerSuffix = ' java11'
3007- def transformServicePythonContainerSuffix = ' 310 '
3007+ def transformServicePythonContainerSuffix = pythonContainerSuffix
30083008
30093009 def setupTask = project. tasks. register(config. name+ " Setup" , Exec ) {
30103010 // Containers for main SDKs when running tests.
Original file line number Diff line number Diff line change 1818
1919# We just need to support one Python version supported by Beam.
2020# Picking the current default Beam Python version which is Python 3.10.
21- FROM python:3.10-bookworm as expansion-service
21+ ARG py_version=3.10
22+ FROM python:${py_version}-bookworm as expansion-service
2223LABEL Author
"Apache Beam <[email protected] >" 2324ARG TARGETOS
2425ARG TARGETARCH
Original file line number Diff line number Diff line change @@ -40,7 +40,8 @@ task copyDockerfileDependencies(type: Copy) {
4040}
4141
4242task copyRequirementsFile (type : Copy ) {
43- from project(' :sdks:python:container:py39' ). fileTree(" ./" )
43+ def pythonVersionSuffix = project. ext. pythonVersion. replace(' .' , ' ' )
44+ from project(" :sdks:python:container:py${ pythonVersionSuffix} " ). fileTree(" ./" )
4445 include ' base_image_requirements.txt'
4546 rename ' base_image_requirements.txt' , ' requirements.txt'
4647 setDuplicatesStrategy(DuplicatesStrategy . INCLUDE )
@@ -70,6 +71,7 @@ docker {
7071 // tags used by dockerTag task
7172 tags containerImageTags()
7273 files " ./build"
74+ buildArgs([' py_version' : " ${ project.ext.pythonVersion} " ])
7375 buildx project. useBuildx()
7476 platform(* project. containerPlatforms())
7577 load project. useBuildx() && ! pushContainers
You can’t perform that action at this time.
0 commit comments