From af61772c889a304d33f6b9b565c130551bd5270c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sun, 25 Jan 2026 20:31:10 +0100
Subject: [PATCH] Revert "Fixed frankenphp docker build"

This reverts commit b91cd449261a99066c791cb951e442f5ea3e3dba.
---
 Dockerfile-frankenphp | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/Dockerfile-frankenphp b/Dockerfile-frankenphp
index abf5f467..f381f330 100644
--- a/Dockerfile-frankenphp
+++ b/Dockerfile-frankenphp
@@ -13,13 +13,32 @@ RUN apt-get update && apt-get -y install \
       zip \
     && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*;
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-        echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-        curl -sL https://deb.nodesource.com/setup_22.x | bash - && \
-        apt-get update && apt-get install -y \
-          nodejs \
-          yarn \
-        && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*
+RUN set -eux; \
+    # Prepare keyrings directory
+    mkdir -p /etc/apt/keyrings; \
+    \
+    # Import Yarn GPG key
+    curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \
+      | tee /etc/apt/keyrings/yarn.gpg >/dev/null; \
+    chmod 644 /etc/apt/keyrings/yarn.gpg; \
+    \
+    # Add Yarn repo with signed-by
+    echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian stable main" \
+      | tee /etc/apt/sources.list.d/yarn.list; \
+    \
+    # Run NodeSource setup script (unchanged)
+    curl -sL https://deb.nodesource.com/setup_22.x | bash -; \
+    \
+    # Install Node.js + Yarn
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+      nodejs \
+      yarn; \
+    \
+    # Cleanup
+    apt-get -y autoremove; \
+    apt-get clean autoclean; \
+    rm -rf /var/lib/apt/lists/*
 
 
 # Install PHP