From 4fe37c9dcd730f82dac07fe3fe91ac0738aa751f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 30 Jun 2026 19:49:38 +0000
Subject: [PATCH 1/3] Add GitHub Copilot CLI to tools image

---
 linux/tools.Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile
index 5d0c123f..08241484 100644
--- a/linux/tools.Dockerfile
+++ b/linux/tools.Dockerfile
@@ -34,6 +34,11 @@ RUN az aks install-cli \
     && chmod +x /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubelogin
 
+# Install GitHub Copilot CLI. GH_DATA_DIR is set to a system-wide path so the
+# extension is available to all users of the container.
+ENV GH_DATA_DIR=/usr/local/share/gh
+RUN curl -fsSL https://gh.io/copilot-install | bash
+
 # Install azure-functions-core-tools
 RUN wget -nv -O Azure.Functions.Cli.zip `curl -fSsL https://api.github.com/repos/Azure/azure-functions-core-tools/releases/latest | grep "url.*linux-x64" | grep -v "sha2" | cut -d '"' -f4` \
     && unzip -d azure-functions-cli Azure.Functions.Cli.zip \

From 26f364b410c366f002a5293648f42e1b030ca149 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 30 Jun 2026 20:41:21 +0000
Subject: [PATCH 2/3] Move GH_DATA_DIR to user home directory

---
 linux/tools.Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile
index 08241484..f9784aa5 100644
--- a/linux/tools.Dockerfile
+++ b/linux/tools.Dockerfile
@@ -34,9 +34,9 @@ RUN az aks install-cli \
     && chmod +x /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubelogin
 
-# Install GitHub Copilot CLI. GH_DATA_DIR is set to a system-wide path so the
-# extension is available to all users of the container.
-ENV GH_DATA_DIR=/usr/local/share/gh
+# Install GitHub Copilot CLI. GH_DATA_DIR is set to the user's home directory
+# so the extension is writable by the end user.
+ENV GH_DATA_DIR=~/.local/share/gh
 RUN curl -fsSL https://gh.io/copilot-install | bash
 
 # Install azure-functions-core-tools

From f9de25ec60441e3c49583194c218f25054b6e87f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 30 Jun 2026 21:05:09 +0000
Subject: [PATCH 3/3] Remove GH_DATA_DIR from tools image

---
 linux/tools.Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile
index f9784aa5..567bfa50 100644
--- a/linux/tools.Dockerfile
+++ b/linux/tools.Dockerfile
@@ -34,9 +34,7 @@ RUN az aks install-cli \
     && chmod +x /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubelogin
 
-# Install GitHub Copilot CLI. GH_DATA_DIR is set to the user's home directory
-# so the extension is writable by the end user.
-ENV GH_DATA_DIR=~/.local/share/gh
+# Install GitHub Copilot CLI.
 RUN curl -fsSL https://gh.io/copilot-install | bash
 
 # Install azure-functions-core-tools