diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..cffe8cdef --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +save-exact=true diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..2f9417a58 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +8.11.4 diff --git a/.travis.yml b/.travis.yml index f1e466c80..8c35ceffb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,6 @@ defaults_go: &DEFAULTS_GO defaults_js: &DEFAULTS_JS language: node_js - # FIXME 8.12 includes npm 6.4.1 which generates a different lock file on - # macOS and Linux, causing diffs on CI and we fail builds when that happens - node_js: "8.11.4" # FIXME same in the 'Build and Deploy' stage # install defaults to "npm install", which is done via make install: [] cache: @@ -65,7 +62,7 @@ jobs: before_script: # this stage needs to build everything including assets file and that # requires running webpack, so we need nodejs here - - nvm install 8.11.4 + - nvm install $(< .nvmrc) script: # compile assets via webpack and build those into bindata_assetfs.go file - make bindata_assetfs.go diff --git a/Dockerfile b/Dockerfile index 1f3bda8c3..6131c3e9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8-alpine as nodejs-builder +FROM node:8.11.4-alpine as nodejs-builder RUN apk add --update make git COPY . /karma RUN make -C /karma ui diff --git a/demo/Dockerfile b/demo/Dockerfile index 956b7eb90..8f0b41f5a 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8-alpine as nodejs-builder +FROM node:8.11.4-alpine as nodejs-builder RUN apk add --update make git COPY . /karma RUN make -C /karma ui