fix: Dockerfile

Author: Tardo

Dockerfile

@@ -80,14 +80,13 @@ ENV PRIVOXY_PORT=8118 \
 
 # Create Privoxy User
 RUN set -ex; \
-    addgroup --gid 7777 --system privoxy; \
-    adduser \
-        --disabled-password \
-        --home /var/lib/privoxy/ \
-        --ingroup privoxy \
+    groupadd --gid 7777 --system privoxy; \
+    useradd \
+        --home-dir /var/lib/privoxy/ \
         --no-create-home \
         --system \
         --uid 7777 \
+        --gid 7777 \
         privoxy; \
     mkdir /var/lib/privoxy/; \
     chown privoxy:privoxy /var/lib/privoxy/;

README.md

@@ -4,7 +4,7 @@
 
 Image with [privoxy](https://www.privoxy.org) enabled and configured to work with HTTPS.
 
-It also includes '[adblock2privoxy](https://github.com/essandess/adblock2privoxy)' to translate adblock rules to privoxy with CSS hidden elements & blackhole.
+It also includes '[ab2p](https://github.com/essandess/adblock2privoxy)' (adblock2privoxy) to translate adblock rules to privoxy with CSS hidden elements & blackhole.
 This means that this image also includes an nginx server so that the advanced CSS rules work correctly.
 
 ## :bulb: Documentation
@@ -24,18 +24,18 @@ This image downloads the 'trustedCAs' file from curl.se and also generates the c
 | PORT | Description | Required |
 |----------------|-------------|-------------|
 | 8118 | Privoxy | :heavy_check_mark: |
-| 80 | Nginx |  |
-| 443 | Nginx SSL |  |
+| 80 | Nginx | If you use the ab2p rules |
+| 443 | Nginx SSL | If you use the ab2p rules |
 
 
 ### Env. Variables
 
 | Name | Description | Default |
 |----------------|-------------|-------------|
 | PRIVOXY_PORT | The Privoxy port | 8118 |
-| ADBLOCK_URLS | String of urls separated by spaces | "" |
+| ADBLOCK_URLS | URLs separated by spaces | "" |
 | ADBLOCK_CSS_DOMAIN | A domain/IP that points to the container (IP:PORT) | 172.17.0.2 |
-| ADBLOCK_NGINX_ENABLED | The server to use to get the css files | true |
+| ADBLOCK_NGINX_ENABLED | Enable NGINX | true |
 | NGINX_SERVER_NAME | The server name for verification process (must coincide with ADBLOCK_CSS_DOMAIN name part) | 172.17.0.2 |
 | NGINX_PORT | The HTTP port | 80 |
 | NGINX_PORT_SSL | The HTTPS port | 443 |
@@ -92,6 +92,10 @@ docker cp privoxy:/usr/local/etc/privoxy/CA/privoxy-ca-bundle.crt .
 
 - `actionsfile privman-rules/user.action` > Where are the privman rules (empty by default)
 - `filterfile privman-rules/user.filter` > Predefined privman aliases
+- `actionsfile ab2p.system.action` > adblock2privoxy
+- `actionsfile ab2p.action` > adblock2privoxy
+- `filterfile ab2p.system.filter` > adblock2privoxy
+- `filterfile ab2p.filter` > adblock2privoxy
 - `buffer-limit` > Increased to 25600KB (25MB)
 - `keep-alive-timeout` > Increased to 120 seconds
 - `socket-timeout` > Decreased to 150 seconds