From 261d1105a00de43845a4a52ece2242d77a58c0e8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 6 Sep 2026 01:55:09 +0000
Subject: [PATCH 1/2] Initial plan


From 16df525a396a37d445ec54985295c7bb9e844498 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 6 Sep 2026 01:58:13 +0000
Subject: [PATCH 2/2] fix: avoid flaky bullseye apt bootstrap dependencies

Co-authored-by: neomantra <26842+neomantra@users.noreply.github.com>
---
 bullseye/Dockerfile          | 15 +++++----------
 bullseye/Dockerfile.debug    | 15 +++++----------
 bullseye/Dockerfile.valgrind | 15 +++++----------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/bullseye/Dockerfile b/bullseye/Dockerfile
index b53e4e0..a2f376c 100644
--- a/bullseye/Dockerfile
+++ b/bullseye/Dockerfile
@@ -30,19 +30,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates \
         gettext-base \
-        gnupg2 \
         lsb-base \
-        lsb-release \
-        software-properties-common \
         wget \
-    && wget -qO /tmp/pubkey.gpg ${RESTY_APT_PGP} \
-    && DEBIAN_FRONTEND=noninteractive apt-key add /tmp/pubkey.gpg \
-    && rm /tmp/pubkey.gpg \
-    && DEBIAN_FRONTEND=noninteractive add-apt-repository -y "deb ${RESTY_APT_REPO} $(lsb_release -sc) openresty" \
+    && wget -qO /etc/apt/trusted.gpg.d/openresty-keyring.gpg ${RESTY_APT_PGP} \
+    && chown root:root /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod ugo+r /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod go-w /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && echo "deb [signed-by=/etc/apt/trusted.gpg.d/openresty-keyring.gpg] ${RESTY_APT_REPO} bullseye openresty" | tee /etc/apt/sources.list.d/openresty.list \
     && DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge \
-        gnupg2 \
-        lsb-release \
-        software-properties-common \
         wget \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/bullseye/Dockerfile.debug b/bullseye/Dockerfile.debug
index 0a2cc9f..abe152f 100644
--- a/bullseye/Dockerfile.debug
+++ b/bullseye/Dockerfile.debug
@@ -30,19 +30,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates \
         gettext-base \
-        gnupg2 \
         lsb-base \
-        lsb-release \
-        software-properties-common \
         wget \
-    && wget -qO /tmp/pubkey.gpg ${RESTY_APT_PGP} \
-    && DEBIAN_FRONTEND=noninteractive apt-key add /tmp/pubkey.gpg \
-    && rm /tmp/pubkey.gpg \
-    && DEBIAN_FRONTEND=noninteractive add-apt-repository -y "deb ${RESTY_APT_REPO} $(lsb_release -sc) openresty" \
+    && wget -qO /etc/apt/trusted.gpg.d/openresty-keyring.gpg ${RESTY_APT_PGP} \
+    && chown root:root /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod ugo+r /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod go-w /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && echo "deb [signed-by=/etc/apt/trusted.gpg.d/openresty-keyring.gpg] ${RESTY_APT_REPO} bullseye openresty" | tee /etc/apt/sources.list.d/openresty.list \
     && DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge \
-        gnupg2 \
-        lsb-release \
-        software-properties-common \
         wget \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/bullseye/Dockerfile.valgrind b/bullseye/Dockerfile.valgrind
index f3ae3bd..0e18327 100644
--- a/bullseye/Dockerfile.valgrind
+++ b/bullseye/Dockerfile.valgrind
@@ -30,19 +30,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         ca-certificates \
         gettext-base \
-        gnupg2 \
         lsb-base \
-        lsb-release \
-        software-properties-common \
         wget \
-    && wget -qO /tmp/pubkey.gpg ${RESTY_APT_PGP} \
-    && DEBIAN_FRONTEND=noninteractive apt-key add /tmp/pubkey.gpg \
-    && rm /tmp/pubkey.gpg \
-    && DEBIAN_FRONTEND=noninteractive add-apt-repository -y "deb ${RESTY_APT_REPO} $(lsb_release -sc) openresty" \
+    && wget -qO /etc/apt/trusted.gpg.d/openresty-keyring.gpg ${RESTY_APT_PGP} \
+    && chown root:root /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod ugo+r /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && chmod go-w /etc/apt/trusted.gpg.d/openresty-keyring.gpg \
+    && echo "deb [signed-by=/etc/apt/trusted.gpg.d/openresty-keyring.gpg] ${RESTY_APT_REPO} bullseye openresty" | tee /etc/apt/sources.list.d/openresty.list \
     && DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge \
-        gnupg2 \
-        lsb-release \
-        software-properties-common \
         wget \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \