diff --git a/Dockerfile b/Dockerfile index fa22d1b5..053cfe07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,7 @@ LABEL \ org.opencontainers.image.source="https://github.com/qdm12/private-internet-access-docker" \ org.opencontainers.image.title="PIA client" \ org.opencontainers.image.description="VPN client to tunnel to private internet access servers using OpenVPN, IPtables, DNS over TLS and Alpine Linux" \ - image-size="21.1MB" \ - image-size="19.9MB" \ + image-size="23.3MB" \ ram-usage="13MB to 80MB" \ cpu-usage="Low to Medium" ENV USER= \ diff --git a/README.md b/README.md index bc6637cb..3e151acf 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ | Image size | RAM usage | CPU usage | | --- | --- | --- | -| 19.9MB | 14MB to 80MB | Low to Medium | +| 23.3MB | 14MB to 80MB | Low to Medium |
Click to show base components

@@ -60,7 +60,6 @@ - Unbound DNS runs *without root* - OpenVPN can run *without root* but this disallows OpenVPN reconnecting, it can be set with `NONROOT=yes` - ## Setup 1.

Requirements

diff --git a/entrypoint.sh b/entrypoint.sh index e6c49dfe..84217159 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -147,7 +147,7 @@ fi printf "Local network parameters:\n" printf " * Extra subnets: $EXTRA_SUBNETS\n" printf " * Tinyproxy HTTP proxy: $TINYPROXY\n" -if [ "$TINYPROXY" = "on" ]; then +if [ "$TINYPROXY" == "on" ]; then printf " * Tinyproxy port: $TINYPROXY_PORT\n" tinyproxy_auth=yes if [ -z $TINYPROXY_USER ]; then @@ -407,12 +407,10 @@ if [ "$TINYPROXY" == "on" ]; then sed -i "/LogLevel /c\LogLevel $TINYPROXY_LOG" /etc/tinyproxy/tinyproxy.conf exitOnError $? printf "DONE\n" - if [ ! -z "$TINYPROXY_PORT" ]; then - printf "[INFO] Setting TinyProxy port to $TINYPROXY_PORT..." - sed -i "/Port /c\Port $TINYPROXY_PORT" /etc/tinyproxy/tinyproxy.conf - exitOnError $? - printf "DONE\n" - fi + printf "[INFO] Setting TinyProxy port to $TINYPROXY_PORT..." + sed -i "/Port /c\Port $TINYPROXY_PORT" /etc/tinyproxy/tinyproxy.conf + exitOnError $? + printf "DONE\n" if [ ! -z "$TINYPROXY_USER" ]; then printf "[INFO] Setting TinyProxy credentials..." echo "BasicAuth $TINYPROXY_USER $TINYPROXY_PASSWORD" >> /etc/tinyproxy/tinyproxy.conf diff --git a/tinyproxy.conf b/tinyproxy.conf index 937879f1..515f09f2 100644 --- a/tinyproxy.conf +++ b/tinyproxy.conf @@ -10,7 +10,4 @@ StartServers 10 MaxRequestsPerChild 0 DisableViaHeader Yes LogLevel Critical -# BasicAuth user password - -# StatFile "/usr/share/tinyproxy/stats.html" -# ViaProxyName "tinyproxy" +# StatFile "/usr/share/tinyproxy/stats.html" \ No newline at end of file