admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated packages and Alpine to 3.10

Browse Source
This commit is contained in:
Quentin McGaw
2019-06-26 17:23:24 +02:00
parent 2281b64709
commit 302aa58dbe
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@@ -1,5 +1,5 @@
ARG BASE_IMAGE=alpine ARG BASE_IMAGE=alpine
ARG ALPINE_VERSION=3.9 ARG ALPINE_VERSION=3.10
FROM ${BASE_IMAGE}:${ALPINE_VERSION} FROM ${BASE_IMAGE}:${ALPINE_VERSION}
ARG BUILD_DATE ARG BUILD_DATE
@@ -16,7 +16,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.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.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="" \ org.label-schema.version="" \
image-size="19.6MB" \ image-size="19.8MB" \
ram-usage="13MB to 80MB" \ ram-usage="13MB to 80MB" \
cpu-usage="Low to Medium" cpu-usage="Low to Medium"
ENV USER= \ ENV USER= \
@@ -42,7 +42,7 @@ RUN apk add -q --progress --no-cache --update openvpn wget ca-certificates iptab
unzip -q openvpn-tcp.zip -d /openvpn/tcp-normal && \ unzip -q openvpn-tcp.zip -d /openvpn/tcp-normal && \
unzip -q openvpn-strong-tcp.zip -d /openvpn/tcp-strong && \ unzip -q openvpn-strong-tcp.zip -d /openvpn/tcp-strong && \
apk del -q --progress --purge unzip && \ apk del -q --progress --purge unzip && \
rm -rf /*.zip /var/cache/apk/* /etc/unbound/unbound.conf /usr/sbin/unbound-anchor /usr/sbin/unbound-checkconf /usr/sbin/unbound-control /usr/sbin/unbound-control-setup /usr/sbin/unbound-host && \ rm -rf /*.zip /var/cache/apk/* /etc/unbound/* /usr/sbin/unbound-anchor /usr/sbin/unbound-checkconf /usr/sbin/unbound-control /usr/sbin/unbound-control-setup /usr/sbin/unbound-host && \
adduser nonrootuser -D -H --uid 1000 && \ adduser nonrootuser -D -H --uid 1000 && \
wget -q https://raw.githubusercontent.com/qdm12/updated/master/files/named.root.updated -O /etc/unbound/root.hints && \ wget -q https://raw.githubusercontent.com/qdm12/updated/master/files/named.root.updated -O /etc/unbound/root.hints && \
wget -q https://raw.githubusercontent.com/qdm12/updated/master/files/root.key.updated -O /etc/unbound/root.key && \ wget -q https://raw.githubusercontent.com/qdm12/updated/master/files/root.key.updated -O /etc/unbound/root.key && \
@@ -60,9 +60,6 @@ COPY unbound.conf /etc/unbound/unbound.conf
COPY entrypoint.sh healthcheck.sh / COPY entrypoint.sh healthcheck.sh /
RUN chown nonrootuser -R /etc/unbound && \ RUN chown nonrootuser -R /etc/unbound && \
chmod 700 /etc/unbound && \ chmod 700 /etc/unbound && \
chmod 500 /entrypoint.sh healthcheck.sh && \ chmod 600 /etc/unbound/unbound.conf && \
chmod 400 \ chmod 500 /entrypoint.sh /healthcheck.sh && \
/etc/unbound/root.hints \ chmod 400 /etc/unbound/root.hints /etc/unbound/root.key /etc/unbound/*.bz2
/etc/unbound/root.key \
/etc/unbound/unbound.conf \
/etc/unbound/*.bz2

12
README.md
View File

@@ -22,14 +22,14 @@
| Image size | RAM usage | CPU usage | | Image size | RAM usage | CPU usage |
| --- | --- | --- | | --- | --- | --- |
| 19.6MB | 14MB to 80MB | Low to Medium | | 19.8MB | 14MB to 80MB | Low to Medium |
<details><summary>Click to show base components</summary><p> <details><summary>Click to show base components</summary><p>
- [Alpine 3.9](https://alpinelinux.org) for a tiny image - [Alpine 3.10](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 - [OpenVPN 2.4.7](https://pkgs.alpinelinux.org/package/v3.10/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) - [IPtables 1.8.3](https://pkgs.alpinelinux.org/package/v3.10/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 - [Unbound 1.9.1](https://pkgs.alpinelinux.org/package/v3.10/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) - [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)
</p></details> </p></details>
@@ -124,7 +124,7 @@
Check the PIA IP address matches your expectations Check the PIA IP address matches your expectations
```sh ```sh
docker run --rm --network=container:pia alpine:3.9 wget -qO- https://ipinfo.io docker run --rm --network=container:pia alpine:3.10 wget -qO- https://ipinfo.io
``` ```
## Environment variables ## Environment variables