Skip to content

Configure Docker auth before Java container push in Dataflow V2 strea… #38607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aIbrahiim wants to merge 1 commit into from
+48 −2
Closed

Configure Docker auth before Java container push in Dataflow V2 strea… #38607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2_Streaming.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run!",
"modification": 1,
"modification": 2,
}
46 changes: 46 additions & 0 deletions runners/google-cloud-dataflow-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,34 @@ def buildAndPushDockerJavaContainer = tasks.register("buildAndPushDockerJavaCont
name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk",
root: "apache",
tag: project.sdk_version)
doFirst {
Copy link
Copy Markdown
Contributor

@Abacn Abacn May 22, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this is relevant to the test timeout. The apache/beam CI just works fine. Probably testing in different environemnt led to AI "fix" that is disjoint with the ongoing issue we see in apache/beam CI

def cloudsdkConfig = System.getenv("CLOUDSDK_CONFIG")
if (cloudsdkConfig == null || !new File(cloudsdkConfig).canWrite()) {
cloudsdkConfig = "/tmp/gcloud"
}
if (cloudsdkConfig == "/tmp/gcloud") {
def tmpGcloudDir = new File(cloudsdkConfig)
tmpGcloudDir.mkdirs()
System.setProperty("CLOUDSDK_CONFIG", cloudsdkConfig)
}
exec {
environment "CLOUDSDK_CONFIG", cloudsdkConfig
commandLine "gcloud", "--quiet", "auth", "configure-docker", "us.gcr.io"
ignoreExitValue = false
}
exec {
environment "CLOUDSDK_CONFIG", cloudsdkConfig
commandLine "gcloud", "--quiet", "auth", "configure-docker", "gcr.io"
ignoreExitValue = false
}
}
doLast {
exec {
commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerJavaImageName}"
}
def cloudsdkConfig = System.getenv("CLOUDSDK_CONFIG") ?: System.getProperty("CLOUDSDK_CONFIG") ?: "/tmp/gcloud"
exec {
environment "CLOUDSDK_CONFIG", cloudsdkConfig
commandLine "gcloud", "docker", "--", "push", "${dockerJavaImageName}"
}
}
Expand All @@ -321,11 +344,34 @@ def buildAndPushDistrolessDockerJavaContainer = tasks.register("buildAndPushDist
name: "${project.docker_image_default_repo_prefix}${javaVer}_sdk_distroless",
root: "apache",
tag: project.sdk_version)
doFirst {
def cloudsdkConfig = System.getenv("CLOUDSDK_CONFIG")
if (cloudsdkConfig == null || !new File(cloudsdkConfig).canWrite()) {
cloudsdkConfig = "/tmp/gcloud"
}
if (cloudsdkConfig == "/tmp/gcloud") {
def tmpGcloudDir = new File(cloudsdkConfig)
tmpGcloudDir.mkdirs()
System.setProperty("CLOUDSDK_CONFIG", cloudsdkConfig)
}
exec {
environment "CLOUDSDK_CONFIG", cloudsdkConfig
commandLine "gcloud", "--quiet", "auth", "configure-docker", "us.gcr.io"
ignoreExitValue = false
}
exec {
environment "CLOUDSDK_CONFIG", cloudsdkConfig
commandLine "gcloud", "--quiet", "auth", "configure-docker", "gcr.io"
ignoreExitValue = false
}
}
doLast {
exec {
commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerJavaDistrolessImageName}"
}
def cloudsdkConfig = System.getenv("CLOUDSDK_CONFIG") ?: System.getProperty("CLOUDSDK_CONFIG") ?: "/tmp/gcloud"
exec {
environment "CLOUDSDK_CONFIG", cloudsdkConfig
commandLine "gcloud", "docker", "--", "push", "${dockerJavaDistrolessImageName}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ ARG TARGETARCH
ARG pull_licenses

# Dependency jars
# jamm.jar is required as a javaagent to get accurate object size measuring
Copy link
Copy Markdown
Contributor

@Abacn Abacn May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears when AI has wrong knowledge in its model it keeps to attempt "correct" it in its thoughts: #38440 (comment)

COPY target/slf4j-api.jar \
target/slf4j-jdk14.jar \
target/jcl-over-slf4j.jar \
target/log4j-over-slf4j.jar \
target/log4j-to-slf4j.jar \
# Required to use jamm as a javaagent to get accurate object size measuring
target/jamm.jar \
/opt/apache/beam/jars/

Expand Down
Loading