1
0
mirror of https://github.com/vimagick/dockerfiles.git synced 2025-02-03 13:21:49 +02:00

update splash

This commit is contained in:
kev 2019-04-20 01:23:05 +08:00
parent a7ad9f2d05
commit 6f283b7a46
2 changed files with 86 additions and 32 deletions

View File

@ -10,25 +10,64 @@ It's fast, lightweight and state-less which makes it easy to distribute.
## docker-compose.yml ## docker-compose.yml
```yaml ```yaml
splash: version: '2'
image: scrapinghub/splash:3.3 services:
command: --maxrss 4096 --max-timeout 300 splash:
ports: image: scrapinghub/splash:3.3.1
- "8050:8050" command: --maxrss 2048 --max-timeout 300 --disable-lua-sandbox
volumes: volumes:
- ./data/filters:/etc/splash/filters - ./data/filters:/etc/splash/filters
- ./data/js-profiles:/etc/splash/js-profiles - ./data/js-profiles:/etc/splash/js-profiles
- ./data/lua_modules:/etc/splash/lua_modules - ./data/lua_modules:/etc/splash/lua_modules
- ./data/proxy-profiles:/etc/splash/proxy-profiles - ./data/proxy-profiles:/etc/splash/proxy-profiles
mem_limit: 4608M mem_limit: 2560M
restart: always restart: unless-stopped
haproxy:
image: haproxy:alpine
ports:
- "8050:8050"
volumes:
- ./data/haproxy:/usr/local/etc/haproxy
depends_on:
- splash
restart: unless-stopped
``` ```
## server ## server
``` File: data/filters/default.txt
$ cd ~/fig/splash
```
||fonts.googleapis.com^
||ajax.googleapis.com^
```
File: data/haproxy/haproxy.cfg
```ini
global
maxconn 4000
defaults
timeout connect 5000ms
timeout client 50000ms
timeout server 50000ms
frontend front
bind *:8050
mode http
default_backend back
backend back
mode http
balance roundrobin
server a splash_splash_1:8050
server b splash_splash_2:8050
server c splash_splash_3:8050
```
```bash
$ cd ~/fig/splash
$ tree $ tree
. .
├── docker-compose.yml ├── docker-compose.yml
@ -36,14 +75,20 @@ $ tree
├── filters ├── filters
│   ├── easylist.txt │   ├── easylist.txt
│   └── default.txt │   └── default.txt
├── haproxy
│   └── haproxy.cfg
├── js-profiles ├── js-profiles
├── lua_modules
│   └── utils.lua
└── proxy-profiles └── proxy-profiles
$ docker-compose up -d --scale splash=3
$ cat data/filters/default.txt $ docker-compose ps
||fonts.googleapis.com^ Name Command State Ports
||ajax.googleapis.com^ ----------------------------------------------------------------------------------
splash_haproxy_1 /docker-entrypoint.sh hapr ... Up 0.0.0.0:8050->8050/tcp
$ docker-compose up -d splash_splash_1 python3 /app/bin/splash -- ... Up 8050/tcp
splash_splash_2 python3 /app/bin/splash -- ... Up 8050/tcp
splash_splash_3 python3 /app/bin/splash -- ... Up 8050/tcp
``` ```
> If `default.txt` file is present in `--filters-path` folder it is used by default > If `default.txt` file is present in `--filters-path` folder it is used by default

View File

@ -1,12 +1,21 @@
splash: version: '2'
image: scrapinghub/splash:3.3 services:
command: --maxrss 4096 --max-timeout 300 splash:
ports: image: scrapinghub/splash:3.3.1
- "8050:8050" command: --maxrss 2048 --max-timeout 300 --disable-lua-sandbox
volumes: volumes:
- ./data/filters:/etc/splash/filters - ./data/filters:/etc/splash/filters
- ./data/js-profiles:/etc/splash/js-profiles - ./data/js-profiles:/etc/splash/js-profiles
- ./data/lua_modules:/etc/splash/lua_modules - ./data/lua_modules:/etc/splash/lua_modules
- ./data/proxy-profiles:/etc/splash/proxy-profiles - ./data/proxy-profiles:/etc/splash/proxy-profiles
mem_limit: 4608M mem_limit: 2560M
restart: always restart: unless-stopped
haproxy:
image: haproxy:alpine
ports:
- "8050:8050"
volumes:
- ./data/haproxy:/usr/local/etc/haproxy
depends_on:
- splash
restart: unless-stopped