From 7ad3a7feee4ca7cd8cc95eed292a20a4fbfcd7ee Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:40:10 +0000
Subject: [PATCH 1/5] Initial plan


From 46eb76de99c1907aa1f8ca7a3447b156eccb8401 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:43:11 +0000
Subject: [PATCH 2/5] Add preventive fix for Yarn GPG key expiration issue

Co-authored-by: mglaman <3698644+mglaman@users.noreply.github.com>
---
 Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index f97e672..49257a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,13 @@ FROM php:8.3-apache AS base
 RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
     apt-get install -y --no-install-recommends nodejs
 
+# Remove Yarn repository if present to prevent GPG key expiration issues
+# The Yarn GPG key (23E7166788B63E1E) has expired, causing apt-get update failures
+# We don't need Yarn as we use npm/npx. If Yarn is needed, use corepack instead.
+RUN rm -f /etc/apt/sources.list.d/yarn.list && \
+    rm -f /usr/share/keyrings/yarnkey.gpg && \
+    apt-get update 2>&1 | grep -i "yarn" || true
+
 RUN apt-get install -y --no-install-recommends \
     libsodium-dev \
     libpng-dev \

From 18c1268b96123bc22a193548136c8edac97442ee Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:44:19 +0000
Subject: [PATCH 3/5] Address code review feedback - simplify Yarn repository
 cleanup

Co-authored-by: mglaman <3698644+mglaman@users.noreply.github.com>
---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49257a6..1e92f56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
 # The Yarn GPG key (23E7166788B63E1E) has expired, causing apt-get update failures
 # We don't need Yarn as we use npm/npx. If Yarn is needed, use corepack instead.
 RUN rm -f /etc/apt/sources.list.d/yarn.list && \
-    rm -f /usr/share/keyrings/yarnkey.gpg && \
-    apt-get update 2>&1 | grep -i "yarn" || true
+    rm -f /usr/share/keyrings/yarnkey.gpg
 
 RUN apt-get install -y --no-install-recommends \
     libsodium-dev \

From 52237ac6abc78fdeb273e1c4b804c048f56d9afb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:44:59 +0000
Subject: [PATCH 4/5] Optimize Dockerfile by combining Yarn cleanup with
 Node.js installation

Co-authored-by: mglaman <3698644+mglaman@users.noreply.github.com>
---
 Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1e92f56..a09c370 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,14 +2,11 @@
 FROM php:8.3-apache AS base
 
 # Install Node.js 24 (includes npm)
-RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
-    apt-get install -y --no-install-recommends nodejs
-
 # Remove Yarn repository if present to prevent GPG key expiration issues
 # The Yarn GPG key (23E7166788B63E1E) has expired, causing apt-get update failures
-# We don't need Yarn as we use npm/npx. If Yarn is needed, use corepack instead.
-RUN rm -f /etc/apt/sources.list.d/yarn.list && \
-    rm -f /usr/share/keyrings/yarnkey.gpg
+RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
+    apt-get install -y --no-install-recommends nodejs && \
+    rm -f /etc/apt/sources.list.d/yarn.list /usr/share/keyrings/yarnkey.gpg
 
 RUN apt-get install -y --no-install-recommends \
     libsodium-dev \

From 650ef52583b68c9105977a90f4f1746701bc7dde Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:45:36 +0000
Subject: [PATCH 5/5] Clarify comments about Yarn GPG key fix

Co-authored-by: mglaman <3698644+mglaman@users.noreply.github.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a09c370..4a9f3d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@
 FROM php:8.3-apache AS base
 
 # Install Node.js 24 (includes npm)
-# Remove Yarn repository if present to prevent GPG key expiration issues
-# The Yarn GPG key (23E7166788B63E1E) has expired, causing apt-get update failures
+# Clean up Yarn repository to prevent GPG key expiration errors
+# Yarn's GPG key (23E7166788B63E1E) has expired, causing apt-get failures if repository is present
 RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
     apt-get install -y --no-install-recommends nodejs && \
     rm -f /etc/apt/sources.list.d/yarn.list /usr/share/keyrings/yarnkey.gpg