embarklabs
/
embark-docker
mirror of https://github.com/embarklabs/embark-docker.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nodeenv exports need to be in a sourced file to avoid nvm conflict

This commit is contained in:
Michael Bradley, Jr 2018-08-21 15:02:42 -05:00
parent d0c41a2d3c
commit d6bb268315
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -192,6 +192,7 @@ COPY env/docker-entrypoint.sh \
/usr/local/bin/ /usr/local/bin/
COPY --chown=embark:embark \ COPY --chown=embark:embark \
env/.bash_env \ env/.bash_env \
env/.bash_env_nodeenv_exports \
env/.bash_env_unset_npm_config \ env/.bash_env_unset_npm_config \
env/.bashrc \ env/.bashrc \
env/.npmrc \ env/.npmrc \

6
env/.bash_env vendored
View File

@ -25,11 +25,7 @@ nac () {
return 1 return 1
fi fi
export -f deactivate_node export -f deactivate_node
export _OLD_NODE_PATH . "${HOME}/.bash_env_nodeenv_exports"
export _OLD_NODE_VIRTUAL_PATH
export _OLD_NODE_VIRTUAL_PS1
export _OLD_npm_config_prefix
export _OLD_NPM_CONFIG_PREFIX
alias denac='deactivate_node' alias denac='deactivate_node'
alias deactivate_node='__denac' alias deactivate_node='__denac'
__versions __versions

5
env/.bash_env_nodeenv_exports vendored Normal file
View File

@ -0,0 +1,5 @@
export _OLD_NODE_PATH
export _OLD_NODE_VIRTUAL_PATH
export _OLD_NODE_VIRTUAL_PS1
export _OLD_npm_config_prefix
export _OLD_NPM_CONFIG_PREFIX