From 98210c41a922c04402f7f12cc2528346caa7dd0e Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 8 Jan 2024 22:49:54 +1100
Subject: [PATCH] Move npm to base image

---
 Dockerfile         | 4 ++++
 Dockerfile.phptest | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 89e45b2..6fa8846 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,10 @@ RUN apk add --no-cache libjpeg libgd libpng freetype freetype-dev zlib-dev libpn
 RUN curl -4 https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer
 ENV COMPOSER_HOME=/var/cache/composer
 
+# Add npm
+RUN apk add --no-cache npm
+
+# Other config
 COPY msmtprc /etc/
 COPY docker/www.conf /usr/local/etc/php-fpm.d/
 COPY docker/nginx-app.conf /etc/nginx/http.d/default.conf
diff --git a/Dockerfile.phptest b/Dockerfile.phptest
index 3f45c7f..49f26da 100644
--- a/Dockerfile.phptest
+++ b/Dockerfile.phptest
@@ -3,7 +3,7 @@
 
 FROM registry.dege.au/leenooks/php:8.1-fpm
 
-# Add other built tools
-RUN apk --no-cache add npm linux-headers \
+# Add xdebug
+RUN apk --no-cache add linux-headers \
  && pecl_install xdebug \
  && apk --no-cache del linux-headers