Merge pull request #224 from LibreCodeCoop/chore/update-node-setup

chore: update node setup

Author: Any97Cris

.docker/php/Dockerfile

@@ -1,7 +1,5 @@
 FROM php:8.3-fpm
 
-ARG NODE_MAJOR=20
-
 RUN apt-get update \
     && apt-get install -y \
         git \
@@ -28,11 +26,15 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | ba
     && nvm install 20 \
     && nvm alias default 20
 
+ENV NVM_DIR   /root/.nvm
+ENV NODE_PATH $NVM_DIR/v20/lib/node_modules
+ENV PATH      $NVM_DIR/v20/bin:$PATH
+
 RUN echo "alias jigsaw=./vendor/bin/jigsaw" >> /etc/bash.bashrc && \
     echo "alias compile='./vendor/bin/jigsaw build'" >> /etc/bash.bashrc && \
     /bin/bash -c "source /etc/bash.bashrc"
 
 WORKDIR /var/www/html
 
 COPY entrypoint.sh /var/www/scripts/
-ENTRYPOINT [ "bash", "/var/www/scripts/entrypoint.sh" ]
+ENTRYPOINT [ "bash", "/var/www/scripts/entrypoint.sh" ]

.docker/php/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. "$NVM_DIR/nvm.sh"
+
 # Set uid of host machine
 usermod --non-unique --uid "${HOST_UID}" www-data
 groupmod --non-unique --gid "${HOST_GID}" www-data

docker-compose.yml

@@ -5,14 +5,12 @@ services:
     ports:
       - 127.0.0.1:${HTTP_PORT:-80}:80
     volumes:
-      - .docker/nginx/:/etc/nginx/conf.d/ 
+      - .docker/nginx/:/etc/nginx/conf.d/
       - ./build_local:/var/www/html
 
   php:
     build:
       context: .docker/php
-      args:
-        - NODE_MAJOR=${NODE_MAJOR:-20}
     ports:
       - "127.0.0.1:${HTTP_PORT:-3000}:3000"
       - "127.0.0.1:${HTTP_PORT_BROWSERSYNC:-3001}:3001"
@@ -25,4 +23,4 @@ services:
       - TZ=${TZ:-America/Sao_Paulo}
       - XDEBUG_CONFIG=${XDEBUG_CONFIG:-client_host=172.17.0.1 start_with_request=yes}
       - XDEBUG_MODE=${XDEBUG_MODE:-debug}
-      - APP_ENV=${APP_ENV:-develop}
+      - APP_ENV=${APP_ENV:-develop}