From ab3352dec1bc28b5b828b35afb5f2d974d6c3fb1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 13:21:26 +0200
Subject: [PATCH] fix npm in dockerfile, re #3935, re #4285

---
 docker/tests/php81/Dockerfile | 5 ++++-
 docker/tests/php82/Dockerfile | 5 ++++-
 docker/tests/php83/Dockerfile | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile
index ceb1d2d337b..bcd805a0fbf 100644
--- a/docker/tests/php81/Dockerfile
+++ b/docker/tests/php81/Dockerfile
@@ -16,7 +16,10 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:18-slim /usr/local/bin /usr/local/bin
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index eee9aad0024..7f18e4e16f1 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -16,7 +16,10 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:18-slim /usr/local/bin /usr/local/bin
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
index b93795ae4f0..54bb5417432 100644
--- a/docker/tests/php83/Dockerfile
+++ b/docker/tests/php83/Dockerfile
@@ -16,7 +16,10 @@ RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
 RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip
 
 # Install node/npm
-COPY --from=node:18-slim /usr/local/bin /usr/local/bin
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y --no-install-recommends nodejs \
+        curl apt-transport-https ca-certificates gnupg unzip git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
-- 
GitLab