update splash

splash/README.md

@@ -10,26 +10,20 @@ It's fast, lightweight and state-less which makes it easy to distribute.
 ## docker-compose.yml
 
 ```yaml
-version: '2'
+version: '3.7'
+
 services:
+
   splash:
-    image: scrapinghub/splash:3.3.1
+    image: scrapinghub/splash:3.4
-    command: --maxrss 2048 --max-timeout 300 --disable-lua-sandbox
+    command: --maxrss 2048 --max-timeout 300 --disable-lua-sandbox --verbosity 1
+    ports:
+      - "8050:8050"
     volumes:
       - ./data/filters:/etc/splash/filters
       - ./data/js-profiles:/etc/splash/js-profiles
       - ./data/lua_modules:/etc/splash/lua_modules
       - ./data/proxy-profiles:/etc/splash/proxy-profiles
-    mem_limit: 2560M
-    restart: unless-stopped
-  haproxy:
-    image: haproxy:alpine
-    ports:
-      - "8050:8050"
-    volumes:
-      - ./data/haproxy:/usr/local/etc/haproxy
-    depends_on:
-      - splash
     restart: unless-stopped
 ```
 
@@ -42,30 +36,6 @@ File: data/filters/default.txt
 ||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
@@ -75,20 +45,15 @@ $ tree
     ├── filters
     │   ├── easylist.txt
     │   └── default.txt
-    ├── haproxy
-    │   └── haproxy.cfg
     ├── js-profiles
     ├── lua_modules
     │   └── utils.lua
     └── proxy-profiles
-$ docker-compose up -d --scale splash=3
+$ docker-compose up -d
 $ docker-compose ps
       Name                    Command               State           Ports
 ----------------------------------------------------------------------------------
-splash_haproxy_1   /docker-entrypoint.sh hapr ...   Up      0.0.0.0:8050->8050/tcp
 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

splash/docker-compose.yml

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

splash/fily

@@ -0,0 +1,2 @@
+log
+acc