From 7dc1d385ab2e7d083ee5161c9b89ff01fe89ac40 Mon Sep 17 00:00:00 2001
From: Hexagon <robinnilsson@gmail.com>
Date: Sun, 15 Jan 2017 22:28:34 +0100
Subject: [PATCH] Fixing docker entrypoint, 1.1.10

---
 Dockerfile           |  4 +---
 docker-entrypoint.sh | 10 ++++------
 package.json         |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c2388af..879cff6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,4 @@ COPY . /usr/src/app
 RUN npm install
 EXPOSE 8080
 RUN chmod +x /usr/src/app/docker-entrypoint.sh
-COPY /usr/src/app/docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD [ "npm", "start"]
\ No newline at end of file
+ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh", "npm", "start"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6d22238..2203ae2 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,9 +1,7 @@
-#!/bin/bash
+#!/bin/sh
+
 set -e
 
-if [ ! -e '/usr/src/app/external-public/index.html' ]; then
-	cp -R /usr/src/app/public /usr/src/app/external-public
-	chown -R www-data /usr/src/app/external-public
-fi
+cp -R /usr/src/app/public/* /usr/src/app/external-public/
 
-exec "$@"
\ No newline at end of file
+exec "$@"
diff --git a/package.json b/package.json
index 3c05f4e..baa9bbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name" : "cryptalk",
-  "version" : "1.1.9",
+  "version" : "1.1.10",
   "description" : "Encrypted HTML5/Node.JS instant chat",
   "main" : "server.js",
   "subdomain": "cryptalk",