diff --git a/.env.example b/.env.example index b7b7563..2b83161 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,7 @@ PROJECTS_DIR=/home/youruser/PhpstormProjects WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 WORKSPACE_TIMEZONE=Europe/Moscow +WORKSPACE_CUSTOM_NODE_VERSION=lts/erbium ### PHP-FPM ############################################# INSTALL_REDIS=true diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 841081e..05532f7 100755 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -37,9 +37,10 @@ services: build: context: ./dockerfiles/workspace args: - - CUSTOM_PUID=1001 + - CUSTOM_PUID=${WORKSPACE_PUID} - CUSTOM_PGID=${WORKSPACE_PGID} - CUSTOM_TZ=${WORKSPACE_TIMEZONE} + - CUSTOM_NODE_VERSION=${WORKSPACE_CUSTOM_NODE_VERSION} restart: always volumes: - ${PROJECTS_DIR}:/var/www diff --git a/dockerfiles/php-fpm/php73.Dockerfile b/dockerfiles/php-fpm/php73.Dockerfile index bed97cb..5feb74d 100644 --- a/dockerfiles/php-fpm/php73.Dockerfile +++ b/dockerfiles/php-fpm/php73.Dockerfile @@ -50,3 +50,20 @@ RUN apt update && \ sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \ locale-gen + +########################################################################### +# Install custom node version +########################################################################### + +USER root + +ARG CUSTOM_NODE_VERSION +ENV CUSTOM_NODE_VERSION ${CUSTOM_NODE_VERSION} + +RUN if [ ${CUSTOM_NODE_VERSION} = true ]; then \ + . ~/.bashrc && nvm install lts/erbium \ + && . ~/.bashrc && nvm alias default lts/erbium \ + && cp -R ~/.nvm/alias /home/laradock/.nvm \ + && cp -R ~/.nvm/versions /home/laradock/.nvm \ + && chown -R ${CUSTOM_PUID}:${CUSTOM_PGID} /home/laradock/.nvm \ +;fi \ No newline at end of file diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile index c6df5f7..0c4bdc2 100644 --- a/dockerfiles/workspace/workspace74.Dockerfile +++ b/dockerfiles/workspace/workspace74.Dockerfile @@ -48,3 +48,20 @@ USER root COPY ./crontab74 /etc/cron.d RUN chmod -R 644 /etc/cron.d + +########################################################################### +# Install custom node version +########################################################################### + +USER root + +ARG CUSTOM_NODE_VERSION +ENV CUSTOM_NODE_VERSION ${CUSTOM_NODE_VERSION} + +RUN if [ ${CUSTOM_NODE_VERSION} = true ]; then \ + . ~/.bashrc && nvm install lts/erbium \ + && . ~/.bashrc && nvm alias default lts/erbium \ + && cp -R ~/.nvm/alias /home/laradock/.nvm \ + && cp -R ~/.nvm/versions /home/laradock/.nvm \ + && chown -R ${CUSTOM_PUID}:${CUSTOM_PGID} /home/laradock/.nvm \ +;fi \ No newline at end of file