Update to nodejs 18 for tests docker stack

nworr · Sep 14, 2023 · 55e89eb · 55e89eb
1 parent 6d1c1d9
commit 55e89eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -12,6 +12,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y --no-install-rec
         zip \
     ; apt-get clean
 
-#install nodejs and npm to build js files
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
-    && apt-get install -y nodejs
+# Install nodejs and npm to build js files
+RUN apt-get install -y ca-certificates curl gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install nodejs -y
diff --git a/tests/docker-conf/phpfpm/Dockerfile b/tests/docker-conf/phpfpm/Dockerfile
@@ -6,7 +6,6 @@ ARG php_version
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PHP_VERSION=${php_version}
 
-
 RUN set -eux; \
     apt-get update; \
     apt-get -y install inotify-tools \
@@ -16,8 +15,12 @@ RUN set -eux; \
     ; apt-get clean
 
 # Install nodejs and npm to build js files
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
-    && apt-get install -y nodejs
+RUN apt-get install -y ca-certificates curl gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install nodejs -y
 
 RUN set -eux; \
     mkdir -p /etc/openldap/ /etc/ssl/ldap/; \