From 86bad66ff4ef9f76d04d205a83f5f04c62301a53 Mon Sep 17 00:00:00 2001
From: Anthony Metzidis <ametzidis@tigertext.com>
Date: Fri, 20 Oct 2017 14:36:44 -0700
Subject: [PATCH] update packages, use yarn , use node 8

---
 Dockerfile   | 13 ++++++++++++-
 package.json | 26 ++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5b9319..deaac6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,14 @@
-FROM node:4-onbuild
 # replace this with your application's default port
+FROM node:8
+RUN mkdir -p /usr/src/app
+RUN curl -o- -L https://yarnpkg.com/install.sh | bash
+WORKDIR /usr/src/app
+
+ARG NODE_ENV
+ENV NODE_ENV $NODE_ENV
+COPY package.json /usr/src/app/
+RUN yarn install && yarn cache clean --force
+COPY . /usr/src/app
+
+CMD [ "yarn", "start" ]
 EXPOSE 7777
diff --git a/package.json b/package.json
index 4f610f8..52ffd51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haste",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "description": "Private Pastebin Server",
   "keywords": [
@@ -14,35 +14,29 @@
   },
   "main": "haste",
   "dependencies": {
-    "busboy": "0.2.4",
-    "connect": "3.4.1",
+    "connect": "3.6.5",
     "connect-ensure-login": "^0.1.1",
-    "connect-query": "^0.2.0",
+    "connect-query": "^1.0.0",
     "connect-ratelimit": "0.0.7",
     "connect-redirection": "0.0.1",
     "connect-route": "0.1.5",
     "cookie-parser": "^1.4.3",
     "dotenv": "^4.0.0",
     "express": "^4.14.0",
+    "express-session": "^1.15.6",
     "nodemon": "^1.11.0",
-    "pg": "4.1.1",
-    "redis": "0.8.1",
-    "redis-url": "0.1.0",
-    "st": "1.1.0",
-    "uglify-js": "1.3.3",
-    "winston": "0.6.2"
+    "passport": "^0.4.0",
+    "passport-google-oauth20": "^1.0.0",
+    "st": "^1.2.2",
+    "uglify-js": "1.3.5",
+    "winston": "2.4.0"
   },
   "devDependencies": {
+    "busboy": "0.2.14",
     "mocha": "*",
-    "passport": "^0.3.2",
-    "passport-google-oauth20": "^1.0.0",
     "should": "*"
   },
   "bundledDependencies": [],
-  "engines": {
-    "node": "0.10.35",
-    "npm": "1.1.49"
-  },
   "bin": {
     "haste-server": "./server.js"
   },