diff --git a/CHANGELOG.md b/CHANGELOG.md index b12aeab..51b403b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Fixed installation of wkhtmltopdf [#245](https://github.com/devilbox/docker-php-fpm/pull/245) - FIxed installation of drupalconsole [#246](https://github.com/devilbox/docker-php-fpm/pull/246) - Fixed installation of symfoni cli [#247](https://github.com/devilbox/docker-php-fpm/pull/247) +- Fixed installation of NodeJS ## Release 0.141 diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 6dc94c7..d40e93d 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -148,6 +148,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="17" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -156,8 +158,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -168,9 +169,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 630c625..1e8bed7 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -160,6 +160,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="17" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -168,8 +170,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -180,9 +181,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 97ae7bf..0a615ed 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -160,6 +160,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="17" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -168,8 +170,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -180,9 +181,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index b0b661f..01255c3 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -160,6 +160,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="17" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -168,8 +170,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -180,9 +181,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 0bcce57..6b6788f 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="17" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a424553..70e29e8 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="17" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index d6bfe85..6853049 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -161,6 +161,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -169,8 +171,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -181,9 +182,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index e5a3a0c..c3315a3 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -161,6 +161,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -169,8 +171,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -181,9 +182,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index ba3c124..269dc66 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index f40834e..ae3f54e 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 009e9d5..0c4c411 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 13661a6..ce4d8be 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index b6f255e..11e3921 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -170,8 +172,7 @@ RUN set -eux \ | tail -1 \ )" \ && mkdir -p /opt/nvm \ - \ - && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ +&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="/opt/nvm" bash \ \ && { \ @@ -182,9 +183,9 @@ RUN set -eux \ \ && chown -R devilbox:devilbox "/opt/nvm" \ \ - && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ -&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ + && su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ +&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 /opt/nvm \ && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 108ced6..c861e46 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -680,8 +680,28 @@ software_available: check: | su -c '. {{ nvm_home }}/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. {{ nvm_home }}/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ + 5.2: + pre: | + NODE_VERSION="17" \ + 5.3: + pre: | + NODE_VERSION="17" \ + 5.4: + pre: | + NODE_VERSION="17" \ + 5.5: + pre: | + NODE_VERSION="17" \ + 5.6: + pre: | + NODE_VERSION="17" \ + 7.0: + pre: | + NODE_VERSION="17" \ all: pre: | + NODE_VERSION="{{ node_version }}" \ + command: | NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -690,8 +710,7 @@ software_available: | tail -1 \ )" \ && mkdir -p {{ nvm_home }} \ - command: | - curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ + && curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \ | NVM_DIR="{{ nvm_home }}" bash \ \ && { \ @@ -703,9 +722,9 @@ software_available: && chown -R devilbox:devilbox "{{ nvm_home }}" \ # Install latest and LTS version and yarn post: | - su -c '. {{ nvm_home }}/nvm.sh; nvm install {{ node_version }}' devilbox \ - && su -c '. {{ nvm_home }}/nvm.sh; nvm use {{ node_version }}' devilbox \ - && su -c '. {{ nvm_home }}/nvm.sh; corepack enable' devilbox \ + su -c ". {{ nvm_home }}/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ + && su -c ". {{ nvm_home }}/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ + && su -c ". {{ nvm_home }}/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 {{ nvm_home }} \ && find {{ nvm_home }} -type f -print0 | xargs -n1 -0 chmod go+w \