From c1676f0c8805833e4b7e94771f17eaa6924844d9 Mon Sep 17 00:00:00 2001
From: Claude Code <64lamei@gmail.com>
Date: Sat, 6 Jun 2026 23:17:10 +0800
Subject: [PATCH 1/3] Fix: add python package to mvn:appengine builder

The google-cloud-sdk installer requires the python command to be available.
The Dockerfile.appengine was installing python3 but not the python package,
which is needed as a symlink/alias for SDK compatibility.

Fixes #1056

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 mvn/Dockerfile.appengine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mvn/Dockerfile.appengine b/mvn/Dockerfile.appengine
index a84998e02..502462434 100644
--- a/mvn/Dockerfile.appengine
+++ b/mvn/Dockerfile.appengine
@@ -3,7 +3,7 @@ ARG MAVEN_VERSION=latest
 FROM gcr.io/${PROJECT_ID}/mvn:${MAVEN_VERSION}
 
 # install python
-RUN apt-get update -y && apt-get install python3 -y
+RUN apt-get update -y && apt-get install python3 python -y
 
 # install cloud sdk into appengine-maven-plugin cache
 RUN set -eux; \

From 6f0a45daefcb51242bc2775779f67b82ba7144dd Mon Sep 17 00:00:00 2001
From: Claude Code <64lamei@gmail.com>
Date: Sat, 6 Jun 2026 23:22:20 +0800
Subject: [PATCH 2/3] Fix: remove legacy docker-compose v1 from docker builder

The docker builder was installing both docker-compose (v1.29.2, legacy) and
docker-compose-plugin (v2.x+, modern), causing version conflicts and unpredictable
behavior. The legacy v1 package is no longer maintained and should not be used.

This change removes docker-compose and keeps only docker-compose-plugin,
which is actively maintained by Docker and compatible with all supported
Docker versions (19.03, 20.10, 24.0).

Fixes #1042

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/Dockerfile-versioned | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile-versioned b/docker/Dockerfile-versioned
index f00e86d49..70789e298 100644
--- a/docker/Dockerfile-versioned
+++ b/docker/Dockerfile-versioned
@@ -5,7 +5,7 @@ ARG DOCKER_VERSION=VERSION
 RUN apt-get -y install \
         docker-ce=${DOCKER_VERSION} \
         docker-ce-cli=${DOCKER_VERSION} \
-        docker-compose docker-compose-plugin && \
+        docker-compose-plugin && \
     apt-get clean
 
 ENTRYPOINT ["/usr/bin/docker"]

From 543f6573b65d24da5de9fa935f243f71df17b9bb Mon Sep 17 00:00:00 2001
From: Claude Code <64lamei@gmail.com>
Date: Sat, 6 Jun 2026 23:23:14 +0800
Subject: [PATCH 3/3] Fix: add deprecation notice to go builder

The gcr.io/cloud-builders/go builder is no longer actively maintained and does
not support current Go versions. This adds a prominent deprecation notice at the
top of the README directing users to migrate to the official golang image, which
is actively maintained by the Docker community.

Fixes #1067

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 go/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/go/README.md b/go/README.md
index 5afa669d5..15b7efd10 100644
--- a/go/README.md
+++ b/go/README.md
@@ -1,5 +1,13 @@
 # Tool builder: `gcr.io/cloud-builders/go`
 
+## ⚠️ DEPRECATED
+
+**This builder is deprecated.** Please migrate to the official [`golang`](https://hub.docker.com/_/golang) image instead.
+
+The `gcr.io/cloud-builders/go` image is no longer actively maintained and does not support current Go versions with security updates. The official `golang` image is actively maintained by the Docker community and provides up-to-date Go tooling and versions.
+
+---
+
 The `gcr.io/cloud-builders/go` image is maintained by the Cloud Build team, but
 it may not support the most recent features or versions of Go. We also do not
 provide historical pinned versions of Go.