Fixing docker entrypoint, 1.1.10

This commit is contained in:
Hexagon 2017-01-15 22:28:34 +01:00
parent dc1e7091f3
commit 7dc1d385ab
3 changed files with 6 additions and 10 deletions

View File

@ -5,6 +5,4 @@ COPY . /usr/src/app
RUN npm install RUN npm install
EXPOSE 8080 EXPOSE 8080
RUN chmod +x /usr/src/app/docker-entrypoint.sh RUN chmod +x /usr/src/app/docker-entrypoint.sh
COPY /usr/src/app/docker-entrypoint.sh / ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh", "npm", "start"]
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD [ "npm", "start"]

View File

@ -1,9 +1,7 @@
#!/bin/bash #!/bin/sh
set -e set -e
if [ ! -e '/usr/src/app/external-public/index.html' ]; then cp -R /usr/src/app/public/* /usr/src/app/external-public/
cp -R /usr/src/app/public /usr/src/app/external-public
chown -R www-data /usr/src/app/external-public
fi
exec "$@" exec "$@"

View File

@ -1,6 +1,6 @@
{ {
"name" : "cryptalk", "name" : "cryptalk",
"version" : "1.1.9", "version" : "1.1.10",
"description" : "Encrypted HTML5/Node.JS instant chat", "description" : "Encrypted HTML5/Node.JS instant chat",
"main" : "server.js", "main" : "server.js",
"subdomain": "cryptalk", "subdomain": "cryptalk",