diff options
| author | Jesús <heckyel@hyperbola.info> | 2023-01-03 00:17:45 +0800 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2023-01-03 00:17:45 +0800 |
| commit | 02f419ff2cf0913625f3035568391bd55f03cb77 (patch) | |
| tree | d1a3923c62e18d8ea3fb1dc65a4dd83a0edbd6e6 | |
| parent | 9e7bf7c6ded968cf313185833d3f3f0b973e276c (diff) | |
| download | tunnel-02f419ff2cf0913625f3035568391bd55f03cb77.tar.lz tunnel-02f419ff2cf0913625f3035568391bd55f03cb77.tar.xz tunnel-02f419ff2cf0913625f3035568391bd55f03cb77.zip | |
| -rw-r--r-- | .pihole.env.sample | 5 | ||||
| -rw-r--r-- | .wireguard.env.sample | 9 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 18 |
4 files changed, 20 insertions, 16 deletions
diff --git a/.pihole.env.sample b/.pihole.env.sample new file mode 100644 index 0000000..94cfc72 --- /dev/null +++ b/.pihole.env.sample @@ -0,0 +1,5 @@ +TZ=Asia/Taipei +WEBPASSWORD=changeme +DEFAULT_HOST=<YOUR-IP-SERVER-OR-DOMAIN> +DNS1=172.20.0.5#5300 +DNS2=no diff --git a/.wireguard.env.sample b/.wireguard.env.sample new file mode 100644 index 0000000..75ec48d --- /dev/null +++ b/.wireguard.env.sample @@ -0,0 +1,9 @@ +PUID=1000 +PGID=1000 +TZ=America/Lima +SERVERURL=<YOUR-IP-SERVER> +SERVERPORT=51820 #optional +PEERS=10 #optional +PEERDNS=auto #optional +INTERNAL_SUBNET_IPV4=10.13.13.0 #optional +INTERNAL_SUBNET_IPV6=fd42:42:42::0 #optional @@ -6,6 +6,10 @@ of the `docker-compose.yml` file To Generate containers: ```console +cp -v .pihole.env.sample .pihole.env && cp -v .wireguard.env.sample .wireguard.env +``` + +```console $ docker-compose -f path/to/docker-compose.yml up -d ``` diff --git a/docker-compose.yml b/docker-compose.yml index 509211c..76a4dc4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,12 +27,7 @@ services: - "53:53/udp" - "67:67/udp" - "80:80/tcp" - environment: - TZ: 'America/Lima' - WEBPASSWORD: <YOUR-PASSWORD> - DEFAULT_HOST: <YOUR-IP-SERVER-OR-DOMAIN> - DNS1: "172.20.0.5#5300" - DNS2: "no" + env_file: .pihole.env volumes: - ./etc-pihole/:/etc/pihole/ - ./etc-dnsmasq.d/:/etc/dnsmasq.d/ @@ -51,16 +46,7 @@ services: cap_add: - NET_ADMIN - SYS_MODULE - environment: - - PUID=1000 - - PGID=1000 - - TZ=America/Lima - - SERVERURL=<YOUR-IP-SERVER> - - SERVERPORT=51820 #optional - - PEERS=10 #optional - - PEERDNS=auto #optional - - INTERNAL_SUBNET_IPV4=10.13.13.0 #optional - - INTERNAL_SUBNET_IPV6=fd42:42:42::0 #optional + env_file: .wireguard.env volumes: - ./wireguard:/config - /lib/modules:/lib/modules |