diff --git a/Dockerfile b/Dockerfile index 7ef0c597..4cce2482 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG ALPINE_VERSION=3.8 +ARG ALPINE_VERSION=3.9 FROM alpine:${ALPINE_VERSION} ARG BUILD_DATE @@ -15,7 +15,7 @@ LABEL org.label-schema.schema-version="1.0.0-rc1" \ org.label-schema.docker.cmd.devel="docker run -it --rm --cap-add=NET_ADMIN --device=/dev/net/tun -e USER=js89ds7 -e PASSWORD=8fd9s239G qmcgaw/private-internet-access" \ org.label-schema.docker.params="REGION=PIA region,PROTOCOL=udp/tcp,ENCRYPTION=strong/normal,BLOCK_MALICIOUS=on/off,BLOCK_NSA=on/off,UNBLOCK=allowed hostnames,USER=PIA user,PASSWORD=PIA password,EXTRA_SUBNETS=extra subnets to allow on the firewall,NONROOT=yes/no" \ org.label-schema.version="" \ - image-size="17.1MB" \ + image-size="19.6MB" \ ram-usage="13MB to 80MB" \ cpu-usage="Low to Medium" ENV USER= \ diff --git a/README.md b/README.md index a4f84c02..47576d89 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,14 @@ | Image size | RAM usage | CPU usage | | --- | --- | --- | -| 17.1MB | 14MB to 80MB | Low to Medium | +| 19.6MB | 14MB to 80MB | Low to Medium |
Click to show base components

-- [Alpine 3.8](https://alpinelinux.org) for a tiny image -- [OpenVPN 2.4.6-r3](https://pkgs.alpinelinux.org/package/v3.8/main/x86_64/openvpn) to tunnel to PIA servers -- [IPtables 1.6.2-r0](https://pkgs.alpinelinux.org/package/v3.8/main/x86_64/iptables) enforces the container to communicate only through the VPN or with other containers in its virtual network (acts as a killswitch) -- [Unbound 1.7.3-r0](https://pkgs.alpinelinux.org/package/v3.8/main/x86_64/unbound) configured with Cloudflare's [1.1.1.1](https://1.1.1.1) DNS over TLS +- [Alpine 3.9](https://alpinelinux.org) for a tiny image +- [OpenVPN 2.4.6-r3](https://pkgs.alpinelinux.org/package/v3.9/main/x86_64/openvpn) to tunnel to PIA servers +- [IPtables 1.6.2-r0](https://pkgs.alpinelinux.org/package/v3.9/main/x86_64/iptables) enforces the container to communicate only through the VPN or with other containers in its virtual network (acts as a killswitch) +- [Unbound 1.7.3-r0](https://pkgs.alpinelinux.org/package/v3.9/main/x86_64/unbound) configured with Cloudflare's [1.1.1.1](https://1.1.1.1) DNS over TLS - [Files and blocking lists built periodically](https://github.com/qdm12/updated/tree/master/files) used with Unbound (see `BLOCK_MALICIOUS` and `BLOCK_NSA` environment variables)

@@ -124,7 +124,7 @@ You can simply use the Docker healthcheck. The container will mark itself as **u 1. Run the same command in a Docker container using your *pia* container as network with: ```bash - docker run --rm --network=container:pia alpine:3.8 wget -qO- https://ipinfo.io/ip + docker run --rm --network=container:pia alpine:3.9 wget -qO- https://ipinfo.io/ip ``` If the displayed IP address appears and is different that your host IP address, the PIA client works ! diff --git a/entrypoint.sh b/entrypoint.sh index 1b2d861b..1b915e72 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -157,7 +157,7 @@ fi printf " * Port: $PORT\n" printf " * Domain: $PIADOMAIN\n" printf "Detecting IP addresses corresponding to $PIADOMAIN...\n" -VPNIPS=$(nslookup $PIADOMAIN localhost | tail -n +5 | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}') +VPNIPS=$(nslookup $PIADOMAIN localhost | tail -n +3 | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}') exitOnError $? for ip in $VPNIPS; do printf " $ip\n"; @@ -206,7 +206,7 @@ printf "DONE\n" ############################################ printf "Setting firewall for killswitch purposes...\n" printf " * Detecting local subnet..." -SUBNET=$(ip route show default | tail -n 1 | cut -d" " -f 1) +SUBNET=$(ip route show | tail -n 1 | cut -d" " -f 1) exitOnError $? printf "$SUBNET\n" printf " * Deleting all iptables rules..."