Skip to content

Commit

Permalink
Fixing docker entrypoint, 1.1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexagon committed Jan 15, 2017
1 parent dc1e709 commit 7dc1d38
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh", "npm", "start"]
10 changes: 4 additions & 6 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
exec "$@"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 7dc1d38

Please sign in to comment.