From 6e57cb432d546b70fd35db127f036d625a4e1476 Mon Sep 17 00:00:00 2001
From: Marji Cermak <marji@morpht.com>
Date: Tue, 23 Jan 2024 17:58:00 +1100
Subject: [PATCH 1/4] Added node v18.19.0 into the image.

---
 Dockerfile | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 22ee026..9103da1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,25 @@ RUN apk add --no-cache --update git \
     && chmod +x /usr/local/bin/composer \
     && echo 'memory_limit = ${PHP_MEMORY_LIMIT}' > /usr/local/etc/php/conf.d/memory-limit.ini
 
+# Remove warning about running as root in composer
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+### Install node
+
+ENV NODE_VERSION=18.19.0 \
+    CHECKSUM=10b7b23b6b867a25f060a433b83f5c3ecb3bcf7cdba1c0ce46443065a832fd41
+
+RUN ARCH='x64'; \
+    set -eu; \
+    apk add --no-cache \
+        libstdc++ \
+    && curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
+    && echo "$CHECKSUM  node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \
+    && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
+    && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
+    && node --version \
+    && npm --version
+
 RUN adduser -D -h /home/runner -u $RUNNER_UID runner
 
 USER runner

From 6f35db07829e6c157bc8c602c7dd65dad9c05731 Mon Sep 17 00:00:00 2001
From: Marji Cermak <marji@morpht.com>
Date: Wed, 31 Jan 2024 21:46:42 +1100
Subject: [PATCH 2/4] Added xvfb package.

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 9103da1..5157020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,7 @@ RUN apk add --no-cache --update git \
         patch \
         rsync \
         libpng libpng-dev libzip-dev \
+        xvfb \
     && docker-php-ext-install gd pdo pdo_mysql zip \
     && apk del libpng-dev \
     && rm -rf /var/cache/apk/* \

From 952a121b75e29f7d186f68c07ec8a30f6d6fbaa0 Mon Sep 17 00:00:00 2001
From: Naveen Valecha <er.naveenvalecha@gmail.com>
Date: Thu, 1 Feb 2024 16:27:40 +0530
Subject: [PATCH 3/4] Added cypress dependencies.

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5157020..9c1c901 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apk add --no-cache --update git \
         patch \
         rsync \
         libpng libpng-dev libzip-dev \
-        xvfb \
+        libnotify libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb \
     && docker-php-ext-install gd pdo pdo_mysql zip \
     && apk del libpng-dev \
     && rm -rf /var/cache/apk/* \

From 891c048b25fe58196496136cc47be1664ebf7394 Mon Sep 17 00:00:00 2001
From: Naveen Valecha <er.naveenvalecha@gmail.com>
Date: Thu, 1 Feb 2024 18:15:43 +0530
Subject: [PATCH 4/4] Revert "Added cypress dependencies."

This reverts commit 952a121b75e29f7d186f68c07ec8a30f6d6fbaa0.
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9c1c901..5157020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apk add --no-cache --update git \
         patch \
         rsync \
         libpng libpng-dev libzip-dev \
-        libnotify libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb \
+        xvfb \
     && docker-php-ext-install gd pdo pdo_mysql zip \
     && apk del libpng-dev \
     && rm -rf /var/cache/apk/* \