Skip to content

Commit b546721

Browse files
committed
variablize nvm install directory
1 parent b681725 commit b546721

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

build/ansible/DOCKERFILES/Dockerfile-work.j2

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,18 +313,18 @@ RUN set -eux \
313313
{%- endif -%}
314314
{#- Version specific gem version available? -#}
315315
{%- 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 \
317317
{#- Generic gem version available? -#}
318318
{%- 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 \
320320
{#- No version info available -#}
321321
{%- 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 \
323323
{%- endif -%}
324324
{#- Fail fast version -#}
325325
{%- if build_fail_fast -%}
326326
{%- 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" }}
328328
{%- else -%}
329329
{{ "\n\t" }}&& true{{ "\n\n" }}
330330
{%- endif -%}
@@ -339,17 +339,17 @@ RUN set -eux \
339339
{%- else -%}
340340
{{ "\n\t" }}\{{ "\n" }}
341341
{%- 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/ \
343343
\
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 \
346346
&& rm -rf /home/devilbox/.npm \
347347
&& rm -rf /home/devilbox/.cache \
348348
&& rm -rf /home/devilbox/.config \
349349
&& rm -rf /tmp/* \
350350
&& (rm -rf /tmp/.* || true) \
351351
\
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)
353353

354354

355355
###
@@ -460,7 +460,7 @@ RUN \
460460
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
461461
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
462462
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}"'; \
464464
echo "export PATH"; \
465465
echo ". /etc/bash-devilbox"; \
466466
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

0 commit comments

Comments
 (0)