summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-05-17 22:55:54 +0200
committerstartxfr <clarue@startx.fr>2015-05-17 22:55:54 +0200
commitd039043c38b92a2fdc2b79213f83a2f2b84a080a (patch)
tree4d9193619fa2c4cc2922528b605d22e82f71e469
parent85ca05debc4d6326a20f83573fce7dfcfd52a791 (diff)
downloadphpmyadmin-d039043c38b92a2fdc2b79213f83a2f2b84a080a.tar.gz
phpmyadmin-d039043c38b92a2fdc2b79213f83a2f2b84a080a.tar.bz2
phpmyadmin-d039043c38b92a2fdc2b79213f83a2f2b84a080a.tar.xz
phpmyadmin-d039043c38b92a2fdc2b79213f83a2f2b84a080a.zip
change in nodejs template
-rw-r--r--Services/nodejs/Dockerfile18
-rw-r--r--Services/nodejs/app/app.js4
2 files changed, 8 insertions, 14 deletions
diff --git a/Services/nodejs/Dockerfile b/Services/nodejs/Dockerfile
index 872648a..9b76beb 100644
--- a/Services/nodejs/Dockerfile
+++ b/Services/nodejs/Dockerfile
@@ -3,15 +3,13 @@ MAINTAINER Christophe LARUE <dev@startx.fr>
RUN yum -y install nodejs npm \
&& yum clean all \
- && mkdir -p /var/nodejs /var/nodejs/app \
- && chmod ug+rx /var/nodejs/app
-COPY sx/* /sx/
-COPY app/* /var/nodejs/app/
-RUN chmod ug+rx /sx/nodejs*
+ && mkdir -p /app \
+ && chmod ug+rx /app
+VOLUME ["/app"]
+WORKDIR /app
+COPY app /app
+ENV MAIN_APP /app/app.js
+ENV NODE_PATH /app/node_modules
EXPOSE 8000
-VOLUME ["/var/nodejs/app"]
-
-ENV MAIN_APP /var/nodejs/app/app.js
-
-CMD ["/sx/nodejs_run.sh"] \ No newline at end of file
+ENTRYPOINT ["node", "/app/app.js"] \ No newline at end of file
diff --git a/Services/nodejs/app/app.js b/Services/nodejs/app/app.js
index 1dd5446..aebd6b8 100644
--- a/Services/nodejs/app/app.js
+++ b/Services/nodejs/app/app.js
@@ -1,14 +1,10 @@
// Load the http module to create an http server.
var http = require('http');
-// Configure our HTTP server to respond with Hello World to all requests.
var server = http.createServer(function (request, response) {
response.writeHead(200, {"Content-Type": "text/plain"});
response.end("Hello World\n");
});
-
-// Listen on port 8000, IP defaults to 127.0.0.1
server.listen(8000);
-// Put a friendly message on the terminal
console.log("Server running at http://127.0.0.1:8000/"); \ No newline at end of file