Merge pull request #59 from LibreCodeCoop/feature/update-node-setup

Update node setup and add new extension dependency
LibreCodeCoop · Nov 10, 2023 · 0fa5a7e · 0fa5a7e
2 parents b883d84 + 846c383
commit 0fa5a7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.docker/Dockerfile.php80 b/.docker/Dockerfile.php80
@@ -13,12 +13,7 @@ RUN apt-get update \
         # cron
         busybox-static \
     && mkdir -p /var/spool/cron/crontabs \
-    && echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data \
-    # Install node
-    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install --no-install-recommends -y nodejs \
-    && node --version \
-    && npm --version
+    && echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
 
 # Install PHP extensions
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -49,6 +44,10 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
     # pevent errors when try to create files at /var/www with user www-data
     && chown -R www-data /var/www
 
+COPY --from=node:20.5-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
+COPY --from=node:20.5-slim /usr/local/bin/node /usr/local/bin/node
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
+
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY config/php/* /usr/local/etc/php/conf.d/
 COPY scripts/* /var/www/scripts/

diff --git a/.docker/web/nginx.conf b/.docker/web/nginx.conf
@@ -154,7 +154,7 @@ http {
 
         # Adding the cache control header for js, css and map files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
+        location ~ \.(?:css|js|mjs|woff2?|svg|gif|map)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to