Skip to content

Commit 79f087e

Browse files
cytopiacytopia
committed
Fixed installation of NodeJS
1 parent b08e7d5 commit 79f087e

File tree

15 files changed

+103
-70
lines changed

15 files changed

+103
-70
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- Fixed installation of wkhtmltopdf [#245](https://github.com/devilbox/docker-php-fpm/pull/245)
1313
- FIxed installation of drupalconsole [#246](https://github.com/devilbox/docker-php-fpm/pull/246)
1414
- Fixed installation of symfoni cli [#247](https://github.com/devilbox/docker-php-fpm/pull/247)
15+
- Fixed installation of NodeJS
1516

1617

1718
## Release 0.141

‎Dockerfiles/work/Dockerfile-5.2

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ RUN set -eux \
148148
\
149149
\
150150
# -------------------- nvm --------------------
151+
&& NODE_VERSION="17" \
152+
\
151153
&& NVM_VERSION="$( \
152154
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
153155
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -156,8 +158,7 @@ RUN set -eux \
156158
| tail -1 \
157159
)" \
158160
&& mkdir -p /opt/nvm \
159-
\
160-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
161+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
161162
| NVM_DIR="/opt/nvm" bash \
162163
\
163164
&& { \
@@ -168,9 +169,9 @@ RUN set -eux \
168169
\
169170
&& chown -R devilbox:devilbox "/opt/nvm" \
170171
\
171-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
172-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
173-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
172+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
173+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
174+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
174175
\
175176
&& chmod 0777 /opt/nvm \
176177
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.3

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ RUN set -eux \
160160
\
161161
\
162162
# -------------------- nvm --------------------
163+
&& NODE_VERSION="17" \
164+
\
163165
&& NVM_VERSION="$( \
164166
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
165167
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
168170
| tail -1 \
169171
)" \
170172
&& mkdir -p /opt/nvm \
171-
\
172-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173174
| NVM_DIR="/opt/nvm" bash \
174175
\
175176
&& { \
@@ -180,9 +181,9 @@ RUN set -eux \
180181
\
181182
&& chown -R devilbox:devilbox "/opt/nvm" \
182183
\
183-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
184-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
186187
\
187188
&& chmod 0777 /opt/nvm \
188189
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.4

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ RUN set -eux \
160160
\
161161
\
162162
# -------------------- nvm --------------------
163+
&& NODE_VERSION="17" \
164+
\
163165
&& NVM_VERSION="$( \
164166
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
165167
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
168170
| tail -1 \
169171
)" \
170172
&& mkdir -p /opt/nvm \
171-
\
172-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173174
| NVM_DIR="/opt/nvm" bash \
174175
\
175176
&& { \
@@ -180,9 +181,9 @@ RUN set -eux \
180181
\
181182
&& chown -R devilbox:devilbox "/opt/nvm" \
182183
\
183-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
184-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
186187
\
187188
&& chmod 0777 /opt/nvm \
188189
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.5

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ RUN set -eux \
160160
\
161161
\
162162
# -------------------- nvm --------------------
163+
&& NODE_VERSION="17" \
164+
\
163165
&& NVM_VERSION="$( \
164166
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
165167
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
168170
| tail -1 \
169171
)" \
170172
&& mkdir -p /opt/nvm \
171-
\
172-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
173174
| NVM_DIR="/opt/nvm" bash \
174175
\
175176
&& { \
@@ -180,9 +181,9 @@ RUN set -eux \
180181
\
181182
&& chown -R devilbox:devilbox "/opt/nvm" \
182183
\
183-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
184-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
184+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
186187
\
187188
&& chmod 0777 /opt/nvm \
188189
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-5.6

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ RUN set -eux \
162162
\
163163
\
164164
# -------------------- nvm --------------------
165+
&& NODE_VERSION="17" \
166+
\
165167
&& NVM_VERSION="$( \
166168
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
167169
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
170172
| tail -1 \
171173
)" \
172174
&& mkdir -p /opt/nvm \
173-
\
174-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175176
| NVM_DIR="/opt/nvm" bash \
176177
\
177178
&& { \
@@ -182,9 +183,9 @@ RUN set -eux \
182183
\
183184
&& chown -R devilbox:devilbox "/opt/nvm" \
184185
\
185-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
187-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
188+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
188189
\
189190
&& chmod 0777 /opt/nvm \
190191
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-7.0

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ RUN set -eux \
162162
\
163163
\
164164
# -------------------- nvm --------------------
165+
&& NODE_VERSION="17" \
166+
\
165167
&& NVM_VERSION="$( \
166168
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
167169
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
170172
| tail -1 \
171173
)" \
172174
&& mkdir -p /opt/nvm \
173-
\
174-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175176
| NVM_DIR="/opt/nvm" bash \
176177
\
177178
&& { \
@@ -182,9 +183,9 @@ RUN set -eux \
182183
\
183184
&& chown -R devilbox:devilbox "/opt/nvm" \
184185
\
185-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
187-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
188+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
188189
\
189190
&& chmod 0777 /opt/nvm \
190191
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-7.1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ RUN set -eux \
161161
\
162162
\
163163
# -------------------- nvm --------------------
164+
&& NODE_VERSION="--lts" \
165+
\
164166
&& NVM_VERSION="$( \
165167
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
166168
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -169,8 +171,7 @@ RUN set -eux \
169171
| tail -1 \
170172
)" \
171173
&& mkdir -p /opt/nvm \
172-
\
173-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
174+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
174175
| NVM_DIR="/opt/nvm" bash \
175176
\
176177
&& { \
@@ -181,9 +182,9 @@ RUN set -eux \
181182
\
182183
&& chown -R devilbox:devilbox "/opt/nvm" \
183184
\
184-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
187188
\
188189
&& chmod 0777 /opt/nvm \
189190
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-7.2

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ RUN set -eux \
161161
\
162162
\
163163
# -------------------- nvm --------------------
164+
&& NODE_VERSION="--lts" \
165+
\
164166
&& NVM_VERSION="$( \
165167
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
166168
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -169,8 +171,7 @@ RUN set -eux \
169171
| tail -1 \
170172
)" \
171173
&& mkdir -p /opt/nvm \
172-
\
173-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
174+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
174175
| NVM_DIR="/opt/nvm" bash \
175176
\
176177
&& { \
@@ -181,9 +182,9 @@ RUN set -eux \
181182
\
182183
&& chown -R devilbox:devilbox "/opt/nvm" \
183184
\
184-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
185-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
185+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
187188
\
188189
&& chmod 0777 /opt/nvm \
189190
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

‎Dockerfiles/work/Dockerfile-7.3

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ RUN set -eux \
162162
\
163163
\
164164
# -------------------- nvm --------------------
165+
&& NODE_VERSION="--lts" \
166+
\
165167
&& NVM_VERSION="$( \
166168
curl -sS 'https://github.com/nvm-sh/nvm/releases' \
167169
| grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
170172
| tail -1 \
171173
)" \
172174
&& mkdir -p /opt/nvm \
173-
\
174-
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175+
&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
175176
| NVM_DIR="/opt/nvm" bash \
176177
\
177178
&& { \
@@ -182,9 +183,9 @@ RUN set -eux \
182183
\
183184
&& chown -R devilbox:devilbox "/opt/nvm" \
184185
\
185-
&& su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
186-
&& su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
187-
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
186+
&& su -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
187+
&& su -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
188+
&& su -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
188189
\
189190
&& chmod 0777 /opt/nvm \
190191
&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

0 commit comments

Comments
 (0)