Merge pull request #3331 from bestlong/workspace-node
fix: workspace nvm install node
This commit is contained in:
commit
f44f2f4261
@ -736,7 +736,7 @@ ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR}
|
|||||||
RUN if [ ${INSTALL_NODE} = true ]; then \
|
RUN if [ ${INSTALL_NODE} = true ]; then \
|
||||||
# Install nvm (A Node Version Manager)
|
# Install nvm (A Node Version Manager)
|
||||||
mkdir -p $NVM_DIR && \
|
mkdir -p $NVM_DIR && \
|
||||||
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash \
|
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \
|
||||||
&& . $NVM_DIR/nvm.sh \
|
&& . $NVM_DIR/nvm.sh \
|
||||||
&& nvm install ${NODE_VERSION} \
|
&& nvm install ${NODE_VERSION} \
|
||||||
&& nvm use ${NODE_VERSION} \
|
&& nvm use ${NODE_VERSION} \
|
||||||
@ -760,7 +760,6 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
|
|||||||
&& if [ ${INSTALL_NPM_ANGULAR_CLI} = true ]; then \
|
&& if [ ${INSTALL_NPM_ANGULAR_CLI} = true ]; then \
|
||||||
npm install -g @angular/cli \
|
npm install -g @angular/cli \
|
||||||
;fi \
|
;fi \
|
||||||
&& ln -s `npm bin --global` /home/laradock/.node-bin \
|
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
# Wouldn't execute when added to the RUN statement in the above block
|
# Wouldn't execute when added to the RUN statement in the above block
|
||||||
@ -780,9 +779,6 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
|
|||||||
echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \
|
echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
# Add PATH for node
|
|
||||||
ENV PATH $PATH:/home/laradock/.node-bin
|
|
||||||
|
|
||||||
# Make it so the node modules can be executed with 'docker-compose exec'
|
# Make it so the node modules can be executed with 'docker-compose exec'
|
||||||
# We'll create symbolic links into '/usr/local/bin'.
|
# We'll create symbolic links into '/usr/local/bin'.
|
||||||
RUN if [ ${INSTALL_NODE} = true ]; then \
|
RUN if [ ${INSTALL_NODE} = true ]; then \
|
||||||
|
Loading…
Reference in New Issue
Block a user