From 2ab6391a2b6a9006e98be47091847bc70ab2da0e Mon Sep 17 00:00:00 2001
From: Nicolas Carlier <n.carlier@nunux.org>
Date: Sat, 31 Oct 2015 21:36:18 +0100
Subject: [PATCH] chore(docker): Update docker image.

---
 .dockerignore |  1 +
 Dockerfile    | 32 +++++++++++++-------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 33d2712..bb12469 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 node_modules/
 .git
 dist/
+.tmp/
diff --git a/Dockerfile b/Dockerfile
index 27730ef..9cea356 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,37 +2,31 @@
 #
 # VERSION 0.0.1
 
-FROM ncarlier/nodejs
+FROM node:4
 
 MAINTAINER Nicolas Carlier <https://github.com/ncarlier>
 
 # Install packages
 RUN apt-get update && apt-get install -y imagemagick
 
-# Add files
-ADD . /opt/keeper
+# Create app directories
+RUN mkdir -p /usr/src/keeper /var/opt/keeper
 
-# Create var directory and fix rights
-RUN mkdir /var/opt/keeper && \
-    chown node.node -R /opt/keeper && \
-    chown node.node -R /var/opt/keeper
+# Setup working directory
+WORKDIR /usr/src/keeper
 
-# Def. working directory
-WORKDIR /opt/keeper
+# Add package definition
+COPY package.json /usr/src/keeper/
 
-# Def. user
-USER node
-ENV HOME /home/node
-
-# Install App
+# Install
 RUN npm install
 
-# Main port
-EXPOSE 3000
+# Ports
+EXPOSE 3000 8080
 
-# Debug port
-EXPOSE 8080
+# Copy sources
+COPY . /usr/src/keeper
 
-ENTRYPOINT ["/usr/bin/npm"]
+ENTRYPOINT ["/usr/local/bin/npm"]
 
 CMD ["start"]