From 63505fdafc29f0eccf3de1f8ad237b9ec1616f7b Mon Sep 17 00:00:00 2001
From: DIYgod <diy.d.god@gmail.com>
Date: Mon, 29 Apr 2019 18:59:21 +0800
Subject: [PATCH] feat(docker): use ready-made image; integrate browserless
 image; remove descriptions for config.js

---
 docker-compose.yml     | 25 +++++++++----------------
 docs/install/README.md | 11 +++--------
 lib/config/.gitkeep    |  0
 3 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 lib/config/.gitkeep

diff --git a/docker-compose.yml b/docker-compose.yml
index 9ed473f379..737832ab4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,35 +3,28 @@ version: '3'
 services:
 
   service.rsshub:
-    build:
-      dockerfile: ./Dockerfile
-      context: .
-      args:
-        # 是否在构建过程中使用淘宝NPM源进行加速
-        USE_CHINA_NPM_REGISTRY: 0
-        # 是否在构建过程中跳过安装 Chromium, 参见 https://docs.rsshub.app/install/#docker-compose-deployment
-        # whether to skip puppeteer Chromium installation or not, refer to https://docs.rsshub.app/en/install/#docker-compose-deployment
-        PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
+    image: diygod/rsshub
     restart: always
-    image: rsshub
     ports:
       - "1200:1200"
     environment:
       NODE_ENV: production
       CACHE_TYPE: redis
       REDIS_URL: 'redis://db.redis:6379/'
-    volumes:
-      - ./lib/config/app.json:/app/lib/app.json
-      - ./lib/config/config.js:/app/lib/config.js
+      PUPPETEER_WS_ENDPOINT: 'ws://service.browserless:3000'
     depends_on:
       - db.redis
+      - service.browserless
+
+  service.browserless:
+    image: browserless/chrome
+    restart: always
 
   db.redis:
-    image: redis:5.0.4-alpine
+    image: redis
+    restart: always
     volumes:
         - redis-data:/data
-    expose:
-      - "6379"
 
 volumes:
   redis-data:
diff --git a/docs/install/README.md b/docs/install/README.md
index 0e4737872e..460acb9996 100644
--- a/docs/install/README.md
+++ b/docs/install/README.md
@@ -84,7 +84,7 @@ $ git pull
 
 ### 添加配置
 
-可以通过修改 `lib/config.js` 或者设置环境变量来配置 RSSHub.
+可以通过设置环境变量来配置 RSSHub.
 
 **如何设置环境变量**
 
@@ -152,12 +152,7 @@ $ docker run -d --name rsshub -p 1200:1200 -e CACHE_EXPIRE=3600 -e GITHUB_ACCESS
 $ docker volume create redis-data
 ```
 
-1.  复制 `lib/config.js` 至 `lib/config/config.js`, 以避免与 master 分支冲突. 由于包含敏感信息, 该配置文件会被 git 忽略.
-
-1.  修改 [docker-compose.yml](https://github.com/DIYgod/RSSHub/blob/master/docker-compose.yml) 中的 `environment` 进行配置
-
-    -   `PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1` 用以跳过 puppeteer Chromium 的安装. 默认为 1, 需要在 `lib/config.js` 中的 `puppeteerWSEndpoint`中设置相应的远程 Chrome Websocket 地址, 以启用相应路由.
-    -   `USE_CHINA_NPM_REGISTRY=1` 防止 npm 受到来自 GFW 的干扰. 默认为 0.
+1.  修改 [docker-compose.yml](https://github.com/DIYgod/RSSHub/blob/master/docker-compose.yml) 中的 `environment` 进行配置（可选）
 
 1.  部署
 
@@ -259,7 +254,7 @@ gcloud app deploy
 
 ### 应用配置
 
-可以通过修改 `lib/config.js` 或者设置环境变量来配置 RSSHub.
+可以通过设置环境变量来配置 RSSHub.
 
 ::: tip 提示
 
diff --git a/lib/config/.gitkeep b/lib/config/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000