diff --git a/.gitignore b/.gitignore index b4e9df8..5e3008f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -make_env +*make_env docker-compose.yml run.sh diff --git a/Dockerfile b/Dockerfile index cdb8863..a262040 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine:3.11 +FROM alpine:3.12 -RUN apk --no-cache add ca-certificates=~20191127-r1 +RUN apk --no-cache add ca-certificates=~20191127-r4 RUN apk --no-cache add privoxy=~3.0.28-r0 -RUN apk --no-cache add openvpn=~2.4.8-r1 +RUN apk --no-cache add openvpn=~2.4.9-r0 RUN apk --no-cache add runit=~2.1.2-r3 -RUN apk --no-cache add wget=~1.20.3-r0 -RUN apk --no-cache add unzip=~6.0-r6 +RUN apk --no-cache add wget=~1.20.3-r1 +RUN apk --no-cache add unzip=~6.0-r8 COPY app /app COPY etc /etc diff --git a/Makefile b/Makefile index f46a27e..6a74ee0 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CONTAINER_INSTANCE ?= default OPTS ?= \ --cap-add=NET_ADMIN \ --device=/dev/net/tun \ ---dns=209.222.18.218 --dns=209.222.18.222 \ +--dns=209.222.18.218 --dns=209.222.18.222 --dns=1.1.1.1 --dns=1.0.0.1 --dns=9.9.9.9 --dns=205.204.88.60 \ --restart=always .PHONY: build push shell run start stop rm release @@ -37,6 +37,9 @@ stop: rm: docker rm $(CONTAINER_NAME)-$(CONTAINER_INSTANCE) +test: + docker run --rm --network=container:$(CONTAINER_NAME)-$(CONTAINER_INSTANCE) appropriate/curl -s ipecho.net/plain + release: build make push -e VERSION=$(VERSION) diff --git a/README.md b/README.md index 69f5dcd..d2bbac1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,18 @@ # Privoxy via Private Internet Access OpenVPN +> **Note:** +> +> PIA's Legacy VPN Network will no longer be available after 31st Oct +> 2020. +> +> The latest docker build now supports PIA's NextGen VPN network. +> Wireguard is currently NOT supported, but will be as soon as it is +> available in the Alpine Linux repositories. +> +> Read the PIA [Legacy VPN Network Sunset +> Announcement](https://www.privateinternetaccess.com/blog/private-internet-access-legacy-vpn-network-sunset-announcement-30-september) +> for more info. + An Alpine Linux container running Privoxy and OpenVPN via Private Internet Access Protect your browsing activities through an encrypted and anonymized VPN proxy! diff --git a/app/ovpn/run b/app/ovpn/run index 020720e..dd25891 100644 --- a/app/ovpn/run +++ b/app/ovpn/run @@ -3,9 +3,9 @@ set -e -u -o pipefail [ ! -d /app/ovpn/config ] && mkdir -p /app/ovpn/config # download and install the latest default recommended ovpn configs -wget -q https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip -unzip -uq openvpn-strong.zip -d /app/ovpn/config -rm -f openvpn-strong.zip +wget -q https://www.privateinternetaccess.com/openvpn/openvpn-strong-tcp-nextgen.zip +unzip -uoq openvpn-strong-tcp-nextgen.zip -d /app/ovpn/config +rm -f openvpn-strong-tcp-nextgen.zip # copy configs to user mount mkdir -p /config/pia