diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-08 00:23:01 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-08 00:23:01 +0200 |
| commit | b0168c8f3c5035b4d610856f2d5d10915d50c1c4 (patch) | |
| tree | f2c4f57a29d8e32e741d6715b38b267950963cbd | |
| parent | ef9d4f4e0615bcc42528e2e73ade0ba02baa3ed9 (diff) | |
Install npm 3 in docker (v3 warns on invalid peer dependencies instead of failing)
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | package.json | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index a15adf856..e630e8a1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ ENV RAILS_ENV=production RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main contrib non-free' >> /etc/apt/sources.list RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libxml2-dev libxslt1-dev nodejs nodejs-legacy npm ffmpeg && rm -rf /var/lib/apt/lists/* +RUN npm install -g npm@3 RUN mkdir /mastodon WORKDIR /mastodon diff --git a/package.json b/package.json index 090f99550..1ea514e1f 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,7 @@ "browserify-incremental": "^3.1.1", "react": "^15.3.0", "react-dom": "^15.3.0", - "react-proxy": "^1.1.8" - }, - "dependencies": { + "react-proxy": "^1.1.8", "axios": "^0.14.0", "es6-promise": "^3.2.1", "immutable": "^3.8.1", |