From 1aedcc056f5c209f2c9e29131cf16205c564e487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 30 Aug 2025 00:30:10 +0200
Subject: [PATCH] Fixed (hopefully) frankenphp dockerfile

---
 Dockerfile-frankenphp | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/Dockerfile-frankenphp b/Dockerfile-frankenphp
index ae837019..74d94e81 100644
--- a/Dockerfile-frankenphp
+++ b/Dockerfile-frankenphp
@@ -13,13 +13,33 @@ RUN apt-get update && apt-get -y install \
       zip \
     && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*;
 
-# Install node and yarn
-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_20.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_20.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
 RUN set -eux; \