update privoxy

privoxy/Dockerfile

@@ -2,15 +2,22 @@
 # Dockerfile for privoxy
 #
 
-FROM alpine
+FROM alpine:3
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
+
+ARG TARGETPLATFORM
+ARG GOSU_VERSION=1.16
 
 RUN set -xe \
-    && apk add -U curl privoxy \
+    && echo ${TARGETPLATFORM} \
-    && curl -sSL https://github.com/tianon/gosu/releases/download/1.9/gosu-amd64 > /usr/sbin/gosu \
+    && GOSU_ARCH=$(echo $TARGETPLATFORM | sed -e 's@linux/@@' \
+                                              -e 's@amd64@amd64@' \
+                                              -e 's@arm64@arm64@' \
+                                              -e 's@arm/v7@armhf@') \
+    && apk add --no-cache curl privoxy \
+    && curl -sSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${GOSU_ARCH} > /usr/sbin/gosu \
     && chmod +x /usr/sbin/gosu \
-    && apk del curl \
+    && apk del curl
-    && rm -rf /var/cache/apk/*
 
 RUN sed -i -e '/^listen-address/s/127.0.0.1/0.0.0.0/' \
            -e '/^accept-intercepted-requests/s/0/1/' \

privoxy/arm/Dockerfile

@@ -1,24 +0,0 @@
-#
-# Dockerfile for privoxy-arm
-#
-
-FROM easypi/alpine-arm
-MAINTAINER kev <noreply@easypi.pro>
-
-RUN set -xe \
-    && apk add -U curl privoxy \
-    && curl -sSL https://github.com/tianon/gosu/releases/download/1.9/gosu-armhf > /usr/sbin/gosu \
-    && chmod +x /usr/sbin/gosu \
-    && apk del curl \
-    && rm -rf /var/cache/apk/*
-
-RUN sed -i -e '/^listen-address/s/127.0.0.1/0.0.0.0/' \
-           -e '/^accept-intercepted-requests/s/0/1/' \
-           -e '/^enforce-blocks/s/0/1/' \
-           -e '/^#debug/s/#//' /etc/privoxy/config
-
-VOLUME /etc/privoxy
-
-EXPOSE 8118
-
-CMD gosu privoxy privoxy --no-daemon /etc/privoxy/config

privoxy/arm/docker-compose.yml

@@ -1,8 +0,0 @@
-privoxy:
-  image: easypi/privoxy-arm
-  ports:
-    - "8118:8118"
-  volumes:
-    - ./privoxy/user.action:/etc/privoxy/user.action
-    - ./privoxy/user.filter:/etc/privoxy/user.filter
-  restart: always

privoxy/docker-compose.yml

@@ -1,8 +1,11 @@
-privoxy:
+version: "3.8"
-  image: vimagick/privoxy
+services:
-  ports:
+  privoxy:
-    - "8118:8118"
+    image: vimagick/privoxy
-  volumes:
+    ports:
-    - ./privoxy/user.action:/etc/privoxy/user.action
+      - "8118:8118"
-    - ./privoxy/user.filter:/etc/privoxy/user.filter
+    volumes:
-  restart: always
+      - ./data/config:/etc/privoxy/config
+      - ./data/user.action:/etc/privoxy/user.action
+      - ./data/user.filter:/etc/privoxy/user.filter
+    restart: unless-stopped