From be0f999f8457cf11b8101d286439534943593454 Mon Sep 17 00:00:00 2001
From: Aalap Shastri <aalapshastri@google.com>
Date: Tue, 26 May 2026 19:03:16 +0000
Subject: [PATCH 1/2] Swap build for image

Change-Id: Iaf926cc213a8c3686701cb734fa0f456f9653fbe
---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9251494481..0808014eac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '2'
 services:
   web:
-    build: .
+    image: us-central1-docker.pkg.dev/your-google-project/kokoro-bakery/google-ads-php-base:${PHP_VERSION:-8.1}
     volumes:
-    - ./:/google-ads-php
-    - ~/:/root
-      
+      - ./:/google-ads-php
+      - ~/:/root
+

From 30851adface725650269b7ea8f1baedf4520a0fc Mon Sep 17 00:00:00 2001
From: Aalap Shastri <aalapshastri@google.com>
Date: Fri, 29 May 2026 16:45:13 +0000
Subject: [PATCH 2/2] update docker configuration to replect KTCB managed paths

Change-Id: Id7ecbeeeccf54dec9c895d19af43d83b9e00d0f1
---
 Dockerfile         | 19 ++++++-------------
 docker-compose.yml |  6 +++---
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b5b865965c..7f1a8c504e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,17 @@
-# Sets the PHP image to extend from.
-# See https://hub.docker.com/_/php.
-ARG PHP_IMAGE="apache"
+# Sets the PHP image to extend from dynamically for local testing.
+ARG PHP_IMAGE="8.1-apache"
 FROM php:${PHP_IMAGE}
 
-ARG USE_C_PROTOBUF=true
-
 RUN apt-get update && apt-get install -y libxml2 zlib1g-dev git unzip
 
-# Install PHP extension(s) required for development.
+# Install standard PHP extensions required for development.
 RUN docker-php-ext-install bcmath
 
 # Install and configure Composer.
 RUN curl -sS https://getcomposer.org/installer | php
 RUN mv composer.phar /usr/local/bin/composer
 
-# Install and configure the gRPC extension.
-RUN pecl install grpc-1.80.0
-RUN echo 'extension=grpc.so' >> $PHP_INI_DIR/conf.d/grpc.ini
-
-# Install and configure the C implementation of Protobuf extension if needed.
-RUN if [ "$USE_C_PROTOBUF" = "false" ]; then echo 'Using PHP implementation of Protobuf'; else echo 'Using C implementation of Protobuf'; pecl install protobuf-4.33.6; echo 'extension=protobuf.so' >> $PHP_INI_DIR/conf.d/protobuf.ini; fi
+# NOTE: gRPC and Protobuf compilation steps are removed from this file 
+# because they are pulled pre-compiled via the Kokoro Bakery image layers.
 
-WORKDIR "/google-ads-php"
+WORKDIR "/google-ads-php"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 0808014eac..07994db3e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '2'
 services:
   web:
-    image: us-central1-docker.pkg.dev/your-google-project/kokoro-bakery/google-ads-php-base:${PHP_VERSION:-8.1}
+    # Points to the official, secure KTCB-managed Artifact Registry paths
+    image: us-central1-docker.pkg.dev/kokoro-container-bakery/google-ads-php/php${PHP_VERSION:-81}-base:manual
     volumes:
       - ./:/google-ads-php
-      - ~/:/root
-
+      - ~/:/root
\ No newline at end of file