From b0168c8f3c5035b4d610856f2d5d10915d50c1c4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Oct 2016 00:23:01 +0200
Subject: Install npm 3 in docker (v3 warns on invalid peer dependencies
 instead of failing)

---
 Dockerfile   | 1 +
 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",
-- 
cgit