update docs/docker

binux · binux · commit 9ab4d4430ec1 · 2015-06-15T01:41:04.000+08:00
diff --git a/docs/Running-pyspider-with-Docker.md b/docs/Running-pyspider-with-Docker.md
@@ -1,73 +1,70 @@
 ```shell
 # mysql
-docker run -d --name mysql dockerfile/mysql:latest
+docker run --name mysql -d -v /data/mysql:/var/lib/mysql -e MYSQL_ALLOW_EMPTY_PASSWORD=yes mysql:latest
 # rabbitmq
-docker run -d --name rabbitmq dockerfile/rabbitmq:latest
+docker run --name rabbitmq -d rabbitmq:latest
+
 # phantomjs
-docker run --name phantomjs -d -v `pwd`:/mnt/test --expose 25555 cmfatih/phantomjs:latest /usr/bin/phantomjs --ssl-protocol=any /mnt/test/pyspider/fetcher/phantomjs_fetcher.js 25555
+docker run --name phantomjs -d binux/pyspider:latest phantomjs
 
 # result worker
-docker run -d --name result_worker --link mysql:mysql --link rabbitmq:rabbitmq binux/pyspider:latest result_worker
+docker run --name result_worker -m 128m -d --link mysql:mysql --link rabbitmq:rabbitmq binux/pyspider:latest result_worker
 # processor, run multiple instance if needed.
-docker run -d --name processor --link mysql:mysql --link rabbitmq:rabbitmq binux/pyspider:latest processor
+docker run --name processor -m 256m -d --link mysql:mysql --link rabbitmq:rabbitmq binux/pyspider:latest processor
 # fetcher, run multiple instance if needed.
-docker run -d --name fetcher --link rabbitmq:rabbitmq --link phantomjs:phantomjs binux/pyspider:latest fetcher
+docker run --name fetcher -m 256m -d --link phantomjs:phantomjs --link rabbitmq:rabbitmq binux/pyspider:latest fetcher --no-xmlrpc
 # scheduler
-docker run -d --name scheduler --link mysql:mysql --link rabbitmq:rabbitmq binux/pyspider:latest scheduler
+docker run --name scheduler -d --link mysql:mysql --link rabbitmq:rabbitmq binux/pyspider:latest scheduler
 # webui
-docker run -d --name webui -p 5000:5000 --link mysql:mysql --link rabbitmq:rabbitmq --link phantomjs:phantomjs --link scheduler:scheduler binux/pyspider:latest webui
+docker run --name webui -m 256m -d -p 5000:5000 --link mysql:mysql --link rabbitmq:rabbitmq --link scheduler:scheduler --link phantomjs:phantomjs binux/pyspider:latest webui
 ```
 
-or running with [fig](http://www.fig.sh/) with `fig.yml`:
+or running with [Docker Compose](https://docs.docker.com/compose/) with `docker-compose.yml`:
+
+NOTE: It's recommended to run mysql and rabbitmq outside compose as they may not been restarted with pyspider. You can find commands to start mysql and rabbitmq service above.
 
 ```
-mysql:
-  image: dockerfile/mysql:latest
-rabbitmq:
-  image: dockerfile/rabbitmq:latest
 phantomjs:
-  image: cmfatih/phantomjs:latest
-  expose:
-    - "25555"
-  volumes:
-    - .:/mnt/test
-  command: /usr/bin/phantomjs  --ssl-protocol=any /mnt/test/pyspider/fetcher/phantomjs_fetcher.js 25555
-result_worker:
   image: binux/pyspider:latest
-  links:
+  command: phantomjs
+result:
+  image: binux/pyspider:latest
+  external_links:
     - mysql
     - rabbitmq
   command: result_worker
 processor:
   image: binux/pyspider:latest
-  links:
+  external_links:
     - mysql
     - rabbitmq
   command: processor
 fetcher:
   image: binux/pyspider:latest
-  links:
+  external_links:
     - rabbitmq
+  links:
     - phantomjs
   command : fetcher
 scheduler:
   image: binux/pyspider:latest
-  links:
+  external_links:
     - mysql
     - rabbitmq
   command: scheduler
 webui:
   image: binux/pyspider:latest
-  links:
+  external_links:
     - mysql
     - rabbitmq
+  links:
     - scheduler
     - phantomjs
-  volumes:
-    - .:/opt/pyspider
   command: webui
   ports:
     - "5000:5000"
 ```
 
-`fig up`
+`docker-compose up`
+
+
