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",