Permalink
Browse files

docker tweaks

  • Loading branch information...
1 parent 63dd37b commit 4b08fc7902916c1b4846b5bb20d65265d2a14cbd Ubuntu committed May 18, 2014
Showing with 176 additions and 15 deletions.
  1. +13 −0 buildweb.sh
  2. +1 −1 docker/doc.dockerfile
  3. +1 −1 docker/hist.dockerfile
  4. +1 −1 docker/real.dockerfile
  5. +15 −0 docker/web.dockerfile
  6. +7 −0 rundocker.sh
  7. +1 −1 srv/doc-srv.js
  8. +1 −1 srv/hist-srv.js
  9. +1 −1 srv/real-srv.js
  10. +2 −0 stopdocker.sh
  11. +3 −3 web/config/app.json
  12. +40 −0 web/grep
  13. +80 −0 web/grep.txt
  14. +7 −6 web/package.json
  15. +3 −0 web/run.sh
View
@@ -0,0 +1,13 @@
+#!/bin/sh
+mkdir -p build/web/web
+mkdir -p build/web/lib
+cp lib/* build/web/lib
+cp -R web/* build/web/web
+cp docker/web.dockerfile build/web/Dockerfile
+cp package.json build/web/
+cd build/web
+npm install
+cd web
+npm install
+bower install
+echo TARGET:build/web
View
@@ -10,6 +10,6 @@ RUN apt-get update
RUN apt-get install -y nodejs
ADD . /
-EXPOSE 3002
+EXPOSE 9002
CMD /usr/bin/node /srv/doc-srv
View
@@ -10,5 +10,5 @@ RUN apt-get update
RUN apt-get install -y nodejs
ADD .
-EXPOSE 3002
+EXPOSE 9000
CMD /usr/bin/node /srv/hist-srv
View
@@ -10,6 +10,6 @@ RUN apt-get update
RUN apt-get install -y nodejs
ADD .
-EXPOSE 3002
+EXPOSE 9001
CMD /usr/bin/node /srv/real-srv
View
@@ -0,0 +1,15 @@
+# DOCKER-VERSION 0.3.4
+FROM ubuntu
+
+RUN echo "deb http://archive.ubuntu.com/ubuntu precise universe" >> /etc/apt/sources.list
+RUN apt-get update
+RUN apt-get install -y software-properties-common
+RUN apt-get install -y python-software-properties python g++ make
+RUN add-apt-repository -y ppa:chris-lea/node.js
+RUN apt-get update
+RUN apt-get install -y nodejs
+
+ADD . /
+EXPOSE 3002
+CMD /usr/bin/node /srv/doc-srv
+
View
@@ -0,0 +1,7 @@
+#!/bin/sh
+sudo docker stop $(sudo docker ps -q)
+sudo docker run -p 9002:9002 -d sudc/doc-srv node /srv/doc-srv
+sudo docker run -p 9000:9000 -d sudc/hist-srv node /srv/hist-srv
+sudo docker run -p 9001:9001 -d sudc/real-srv node /srv/real-srv
+sudo docker run -p 8000:8000 -d sudc/web sh /web/run.sh
+
View
@@ -6,5 +6,5 @@ require('seneca')()
.use('../lib/doc.js')
//.listen({type:'queue',pin:{role:'doc',kind:'clock',cmd:'*'},host:beanstalk_host})
//.client({type:'pubsub',host:redis_host})
- .listen({port:9002})
+ .listen({host: '0.0.0.0', port:9002})
View
@@ -4,4 +4,4 @@ require('seneca')()
// .use('level-store',{folder:'../data/hist'})
.use('../lib/hist.js')
// .listen({type:'pubsub',host:redis_host})
- .listen({port:9000})
+ .listen({host: '0.0.0.0', port:9000})
View
@@ -3,4 +3,4 @@ var redis_host = process.env.REDIS_HOST||'127.0.0.1'
require('seneca')()
.use('../lib/real.js')
// .listen({type:'pubsub',host:redis_host})
- .listen({port:9001})
+ .listen({host: '0.0.0.0', port:9001})
View
@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo docker stop $(sudo docker ps -q)
View
@@ -8,9 +8,9 @@
// "contentPath": "path:./locales"
// },
//
-// "routes": {
-// "routePath": "path:./controllers"
-// },
+ "routes": {
+ "routePath": "path:./controllers"
+ }
//
// "view engines": {
// "js": {
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -12,14 +12,15 @@
"node": ">=0.10.0"
},
"dependencies": {
- "kraken-js": "~0.7.0",
- "express": "~3.4.4",
"adaro": "~0.1.x",
- "nconf": "~0.6.8",
- "less": "~1.6.1",
- "dustjs-linkedin": "~2.0.3",
"dustjs-helpers": "~1.1.1",
- "makara": "~0.3.0"
+ "dustjs-linkedin": "~2.0.3",
+ "express": "~3.4.4",
+ "kraken-js": "~0.7.0",
+ "less": "~1.6.1",
+ "makara": "~0.3.0",
+ "nconf": "~0.6.8",
+ "seneca": "^0.5.17"
},
"devDependencies": {
"mocha": "~1.17.0",
View
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /web
+node index.js

0 comments on commit 4b08fc7

Please sign in to comment.