Skip to content

fix(cli): consume AGENT_GATEWAY_ROOT_CERTIFICATES in deploy Dockerfile #6428

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

Open
Solaris-star wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −0
Open

fix(cli): consume AGENT_GATEWAY_ROOT_CERTIFICATES in deploy Dockerfile #6428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4dc779
fix(cli): consume AGENT_GATEWAY_ROOT_CERTIFICATES in deploy Dockerfile
Solaris-star Jul 20, 2026
2b251f2
Merge branch 'main' into fix/6427-agent-gateway-root-certs
rohityan Jul 21, 2026
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
10 changes: 10 additions & 0 deletions src/google/adk/cli/cli_deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ def _ensure_agent_engine_dependency(requirements_txt_path: str) -> None:
FROM python:3.11-slim
WORKDIR /app

# Optional Agent Gateway TLS interception root CA.
# Cloud Build may pass AGENT_GATEWAY_ROOT_CERTIFICATES; without consuming it,
# outbound HTTPS/gRPC through the gateway fails certificate verification.
ARG AGENT_GATEWAY_ROOT_CERTIFICATES
RUN if [ -n "$AGENT_GATEWAY_ROOT_CERTIFICATES" ]; then \
mkdir -p /usr/local/share/ca-certificates && \
echo "$AGENT_GATEWAY_ROOT_CERTIFICATES" > /usr/local/share/ca-certificates/agw-ca.crt && \
update-ca-certificates; \
fi

# Create a non-root user
RUN adduser --disabled-password --gecos "" myuser

Expand Down
2 changes: 2 additions & 0 deletions tests/unittests/cli/utils/test_cli_deploy_to_cloud_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ def test_to_cloud_run_happy_path(
expected_command = "api_server --with_ui" if with_ui else "api_server"
assert f"CMD adk {expected_command} --port=8080" in dockerfile_content
assert "FROM python:3.11-slim" in dockerfile_content
assert "ARG AGENT_GATEWAY_ROOT_CERTIFICATES" in dockerfile_content
assert "update-ca-certificates" in dockerfile_content
assert (
'RUN adduser --disabled-password --gecos "" myuser' in dockerfile_content
)
Expand Down
Loading