From 34ee0334c0d74cf9501c7c28e9c696f0c472a019 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Wed, 10 Aug 2016 11:32:53 +0800
Subject: [PATCH] update scrapyd

---
 scrapyd/README.md          | 38 +++++++++++++++++++++++++++++++-------
 scrapyd/docker-compose.yml |  8 ++++++++
 scrapyd/scrapyd.conf       |  1 +
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/scrapyd/README.md b/scrapyd/README.md
index 47b7db8..671dc5c 100644
--- a/scrapyd/README.md
+++ b/scrapyd/README.md
@@ -26,14 +26,37 @@ This image is based on `debian:jessie`, 5 latest python packages are installed:
 
 Please use this as base image for your own project.
 
+## docker-compose.yml
+
+```yaml
+scrapyd:
+  image: vimagick/scrapyd
+  ports:
+    - "6800:6800"
+  restart: always
+
+scrapy:
+  image: vimagick/scrapyd
+  command: bash
+  volumes:
+    - .:/code
+  working_dir: /code
+  restart: always
+```
+
 ## Run it as background-daemon for scrapyd
 
-```
-$ docker run -d --restart always --name scrapyd -p 6800:6800 vimagick/scrapyd
-$ firefox http://localhost:6800
+```bash
+$ docker-compose up -d scrapyd
+$ docker-compose logs -f scrapyd
+$ docker cp scrapyd_scrapyd_1:/var/lib/scrapyd/items .
+$ tree items
+└── myproject
+    └── myspider
+        └── ad6153ee5b0711e68bc70242ac110005.jl
 ```
 
-```
+```bash
 $ mkvirtualenv webbot
 $ pip install scrapy scrapyd-client
 
@@ -48,11 +71,12 @@ $ scrapy list
 $ vi scrapy.cfg
 $ scrapyd-client deploy
 $ curl http://localhost:6800/schedule.json -d project=myproject -d spider=myspider
+$ firefox http://localhost:6800
 ```
 
 File: scrapy.cfg
 
-```
+```ini
 [settings]
 default = myproject.settings
 
@@ -63,7 +87,7 @@ project = myproject
 
 ## Run it as interactive-shell for scrapy
 
-```
+```bash
 $ cat > stackoverflow_spider.py << _EOF_
 import scrapy
 
@@ -86,7 +110,7 @@ class StackOverflowSpider(scrapy.Spider):
         }
 _EOF_
 
-$ docker run -it --rm -v `pwd`:/code -w /code vimagick/scrapyd bash
+$ docker-compose run --rm scrapy
 >>> scrapy runspider stackoverflow_spider.py -o top-stackoverflow-questions.json
 >>> cat top-stackoverflow-questions.json
 >>> exit
diff --git a/scrapyd/docker-compose.yml b/scrapyd/docker-compose.yml
index e0f9aab..6a066be 100644
--- a/scrapyd/docker-compose.yml
+++ b/scrapyd/docker-compose.yml
@@ -3,3 +3,11 @@ scrapyd:
   ports:
     - "6800:6800"
   restart: always
+
+scrapy:
+  image: vimagick/scrapyd
+  command: bash
+  volumes:
+    - .:/code
+  working_dir: /code
+  restart: always
diff --git a/scrapyd/scrapyd.conf b/scrapyd/scrapyd.conf
index 77f31f5..99e21a4 100644
--- a/scrapyd/scrapyd.conf
+++ b/scrapyd/scrapyd.conf
@@ -24,3 +24,4 @@ listspiders.json  = scrapyd.webservice.ListSpiders
 delproject.json   = scrapyd.webservice.DeleteProject
 delversion.json   = scrapyd.webservice.DeleteVersion
 listjobs.json     = scrapyd.webservice.ListJobs
+daemonstatus.json = scrapyd.webservice.DaemonStatus