diff --git a/Dockerfile b/Dockerfile index 45ff9ed4..38ef1319 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM alpine:3.7 LABEL maintainer="quentin.mcgaw@gmail.com" \ description="VPN client to private internet access servers using OpenVPN, Alpine and Cloudflare 1.1.1.1 DNS over TLS" \ - download="5.9MB" \ + download="5.6MB" \ size="13.5MB" \ - ram="11.89MB" \ - cpu_usage="Low to medium" \ + ram="12MB" \ + cpu_usage="Low" \ github="https://github.com/qdm12/private-internet-access-docker" RUN apk add -q --progress --no-cache --update openvpn unbound ca-certificates && \ apk add -q --progress --no-cache --update --virtual=build-dependencies unzip && \ diff --git a/README.md b/README.md index 44a08261..ab476ae2 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ Optionally set the protocol (TCP, UDP) and the level of encryption using Docker | Download size | Image size | RAM usage | CPU usage | | --- | --- | --- | --- | -| 5.9MB | 13.5MB | 11.89MB | Low to Medium | +| 5.6MB | 13.5MB | 12MB | Low | It is based on: - [Alpine 3.7](https://alpinelinux.org) - [OpenVPN 2.4.5-r1](https://pkgs.alpinelinux.org/package/edge/main/ppc64le/openvpn) - [Unbound 1.7.0-r2](https://pkgs.alpinelinux.org/package/edge/main/aarch64/unbound) -- wget and ca-certificates for the healthcheck +- Ca-Certificates for the healthcheck (through HTTPS) It requires: - A Private Internet Access **username** and **password** - [Sign up](https://www.privateinternetaccess.com/pages/buy-vpn/) diff --git a/entrypoint.sh b/entrypoint.sh index 6f78434d..10de03fb 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,12 +3,12 @@ printf "\nDetecting details from public IP address..." export CITY=$(wget -qO- -T 2 https://ipinfo.io/city) export ORG=$(wget -qO- -T 2 https://ipinfo.io/org) -printf "DONE\nOrganization: $ORG\nCountry: $COUNTRY\nCity: $CITY\nChanging DNS to localhost..." +printf "DONE\nOrganization: $ORG\nCity: $CITY\nChanging DNS to localhost..." echo "nameserver 127.0.0.1" > /etc/resolv.conf echo "options ndots:0" >> /etc/resolv.conf printf "DONE\nStarting Unbound to connect to Cloudflare DNS 1.1.1.1 at its TLS endpoint..." unbound printf "DONE\nStarting OpenVPN using $PROTOCOL with $ENCRYPTION encryption\n" -DIR=/openvpn-$PROTOCOL-$ENCRYPTION -openvpn --config $DIR/$REGION.ovpn --auth-user-pass /auth.conf --ca $DIR/ca.rsa.*.crt --crl-verify $DIR/ca.rsa.*.crt +cd /openvpn-$PROTOCOL-$ENCRYPTION +openvpn --config $REGION.ovpn --auth-user-pass /auth.conf printf "\n\nExiting..."