@@ -313,18 +313,18 @@ RUN set -eux \
313
313
{% - endif -%}
314
314
{#- Version specific gem version available? -#}
315
315
{% - if php_version in npm_available [tool ] and 'version' in npm_available [tool ][php_version ] -%}
316
- {{ "\n\t" }}&& su -c '. /opt/nvm /nvm.sh; npm install -g --force {{ npm_available[tool] ['name'] }} {{ npm_available[tool] [php_version] ['version'] }}' devilbox \
316
+ {{ "\n\t" }}&& su -c '. {{ nvm_home }} /nvm.sh; npm install -g --force {{ npm_available[tool] ['name'] }} {{ npm_available[tool] [php_version] ['version'] }}' devilbox \
317
317
{#- Generic gem version available? -#}
318
318
{% - elif 'all' in npm_available [tool ] and 'version' in npm_available [tool ]['all' ] -%}
319
- {{ "\n\t" }}&& su -c '. /opt/nvm /nvm.sh; npm install -g --force {{ npm_available[tool] ['name'] }} {{ npm_available[tool] ['all'] ['version'] }}' devilbox \
319
+ {{ "\n\t" }}&& su -c '. {{ nvm_home }} /nvm.sh; npm install -g --force {{ npm_available[tool] ['name'] }} {{ npm_available[tool] ['all'] ['version'] }}' devilbox \
320
320
{#- No version info available -#}
321
321
{% - else -%}
322
- {{ "\n\t" }}&& su -c '. /opt/nvm /nvm.sh; npm install -g --force {{ npm_available[tool] ['name'] }}' devilbox \
322
+ {{ "\n\t" }}&& su -c '. {{ nvm_home }} /nvm.sh; npm install -g --force {{ npm_available[tool] ['name'] }}' devilbox \
323
323
{% - endif -%}
324
324
{#- Fail fast version -#}
325
325
{% - if build_fail_fast -%}
326
326
{% - if 'check' in npm_available [tool ] -%}
327
- {{ "\n\t" }}&& PATH=$PATH:/opt/nvm/ versions/node/$(/bin/ls -1 /opt/nvm/ versions/node/ | sort -V | tail -1)/bin /opt/nvm/ versions/node/$(/bin/ls -1 /opt/nvm /versions/node/ | sort -V | tail -1)/bin/{{ npm_available[tool] ['check'] }}{{ "\n\n" }}
327
+ {{ "\n\t" }}&& PATH=$PATH:{{ nvm_home }}/ versions/node/$(/bin/ls -1 {{ nvm_home }}/ versions/node/ | sort -V | tail -1)/bin {{ nvm_home }}/ versions/node/$(/bin/ls -1 {{ nvm_home }} /versions/node/ | sort -V | tail -1)/bin/{{ npm_available[tool] ['check'] }}{{ "\n\n" }}
328
328
{% - else -%}
329
329
{{ "\n\t" }}&& true{{ "\n\n" }}
330
330
{% - endif -%}
@@ -339,17 +339,17 @@ RUN set -eux \
339
339
{% - else -%}
340
340
{{ "\n\t" }}\{{ "\n" }}
341
341
{% - endif %}
342
- && ln -sf $(dirname $(su -c '. /opt/nvm /nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
342
+ && ln -sf $(dirname $(su -c '. {{ nvm_home }} /nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
343
343
\
344
- && su -c '. /opt/nvm /nvm.sh; npm cache clear --force' devilbox \
345
- && su -c '. /opt/nvm /nvm.sh; nvm cache clear --force' devilbox \
344
+ && su -c '. {{ nvm_home }} /nvm.sh; npm cache clear --force' devilbox \
345
+ && su -c '. {{ nvm_home }} /nvm.sh; nvm cache clear --force' devilbox \
346
346
&& rm -rf /home/devilbox/.npm \
347
347
&& rm -rf /home/devilbox/.cache \
348
348
&& rm -rf /home/devilbox/.config \
349
349
&& rm -rf /tmp/* \
350
350
&& (rm -rf /tmp/.* || true) \
351
351
\
352
- && (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
352
+ && (find {{ nvm_home }} -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
353
353
354
354
355
355
###
@@ -460,7 +460,7 @@ RUN \
460
460
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
461
461
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
462
462
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
463
- echo 'PATH="/opt/nvm /versions/node/$(nvm version default)/bin:${PATH}"'; \
463
+ echo 'PATH="{{ nvm_home }} /versions/node/$(nvm version default)/bin:${PATH}"'; \
464
464
echo "export PATH"; \
465
465
echo ". /etc/bash-devilbox"; \
466
466
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
0 commit comments