aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2018-05-22 16:17:04 -0700
committerGravatar GitHub <noreply@github.com>2018-05-22 16:17:04 -0700
commit18ce0cf26e733647b33cbaafee57245fdfb932e7 (patch)
tree9fc5701415b66ff7c66e2361bf1579dc4368a495 /templates/tools
parent09ff36371ded2059656afef6931ba69979d12b43 (diff)
parent143c7e1e6dedd6a1f0e5129f91c835044c1bf91d (diff)
Merge pull request #15491 from murgatroid99/node_docker_npm_fix
Don't update npm when installing node
Diffstat (limited to 'templates/tools')
-rw-r--r--templates/tools/dockerfile/node_deps.include13
1 files changed, 7 insertions, 6 deletions
diff --git a/templates/tools/dockerfile/node_deps.include b/templates/tools/dockerfile/node_deps.include
index bee3087b3f..581b6efd1a 100644
--- a/templates/tools/dockerfile/node_deps.include
+++ b/templates/tools/dockerfile/node_deps.include
@@ -5,9 +5,10 @@
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
# Install all versions of node that we want to test
-RUN /bin/bash -l -c "nvm install 4 && npm config set cache /tmp/npm-cache && npm install -g npm"
-RUN /bin/bash -l -c "nvm install 5 && npm config set cache /tmp/npm-cache && npm install -g npm"
-RUN /bin/bash -l -c "nvm install 6 && npm config set cache /tmp/npm-cache && npm install -g npm"
-RUN /bin/bash -l -c "nvm install 8 && npm config set cache /tmp/npm-cache && npm install -g npm"
-RUN /bin/bash -l -c "nvm install 9 && npm config set cache /tmp/npm-cache && npm install -g npm"
-RUN /bin/bash -l -c "nvm alias default 9" \ No newline at end of file
+RUN /bin/bash -l -c "nvm install 4 && npm config set cache /tmp/npm-cache"
+RUN /bin/bash -l -c "nvm install 5 && npm config set cache /tmp/npm-cache"
+RUN /bin/bash -l -c "nvm install 6 && npm config set cache /tmp/npm-cache"
+RUN /bin/bash -l -c "nvm install 8 && npm config set cache /tmp/npm-cache"
+RUN /bin/bash -l -c "nvm install 9 && npm config set cache /tmp/npm-cache"
+RUN /bin/bash -l -c "nvm install 10 && npm config set cache /tmp/npm-cache"
+RUN /bin/bash -l -c "nvm alias default 10" \ No newline at end of file