Skip to content

Commit

Permalink
chore(node): use node 8 and npm 5
Browse files Browse the repository at this point in the history
  • Loading branch information
nLight committed Jun 8, 2017
1 parent e6dd501 commit 59b76b3
Show file tree
Hide file tree
Showing 8 changed files with 6,631 additions and 5,294 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4
6.10.2
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: node_js

node_js:
- 4.4.4
- 8

install:
- npm set progress=false
- npm install -g npm@3.9.1
- npm install -g npm@5.0
- npm install
- npm run scaffold
- npm install -g cypress-cli
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM mesosphere/dcos-system-test-driver:latest

# Specify the component versions to use
ENV CYPRESS_VERSION="0.19.1" \
NODE_VERSION="4.4.7" \
NPM_VERSION="3.9" \
NODE_VERSION="8.0.x" \
NPM_VERSION="5.0.x" \
JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"

# Expose the 4200 port
Expand All @@ -19,7 +19,7 @@ COPY scripts/docker-entrypoint /usr/local/bin/dcos-ui-docker-entrypoint
# Install required components & prepare environment
RUN set -x \

# Install node 4.4.7 & npm 3.9
# Install node & npm
&& curl -o- https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | tar -C /usr/local --strip-components=1 -zx \
&& npm install -g npm@${NPM_VERSION} \

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a container to run the cypress product from cypress.io.
# It includes openjdk8 because the intention is to be run as a
# Jenkins process.
FROM node:4.4.4
LABEL node-version="4.4.4" cypress-version="0.15.3"
FROM node:8.0.0
LABEL node-version="8.0.0" cypress-version="0.15.3"

ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64

Expand All @@ -19,7 +19,7 @@ RUN apt-get update \
RUN /var/lib/dpkg/info/ca-certificates-java.postinst configure

# Update npm
RUN npm install -g npm@3.9.0
RUN npm install -g npm@5.0.3

# Install known dependencies
RUN mkdir /cached-npm_modules \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The DC/OS UI is used by datacenter operators to administer and manage a datacent

### Requirements

Node 4.4.x and NPM 3.9.x (and above) are **required**. We suggest using [nvm](https://github.com/creationix/nvm) or [n](https://github.com/tj/n) to keep multiple Node versions on your system.
Node 8.0.x and NPM 5.0.x (and above) are **required**. We suggest using [nvm](https://github.com/creationix/nvm) or [n](https://github.com/tj/n) to keep multiple Node versions on your system.

### DC/OS Installation Instructions:
1. Follow the instructions [here](https://github.com/dcos/dcos-vagrant) to install a local cluster.
Expand Down
Loading

0 comments on commit 59b76b3

Please sign in to comment.