diff --git a/docker-compose.beta.yml b/docker-compose.beta.yml deleted file mode 100644 index 94b5e86a..00000000 --- a/docker-compose.beta.yml +++ /dev/null @@ -1,44 +0,0 @@ -volumes: - etc_wireguard: - -services: - wg-easy: - #environment: - # Optional: - # - PORT=51821 - # - HOST=0.0.0.0 - # - INSECURE=false - - image: ghcr.io/wg-easy/wg-easy:15 - container_name: wg-easy - networks: - wg: - ipv4_address: 10.42.42.42 - ipv6_address: fdcc:ad94:bacf:61a3::2a - volumes: - - etc_wireguard:/etc/wireguard - - /lib/modules:/lib/modules:ro - ports: - - "51820:51820/udp" - - "51821:51821/tcp" - restart: unless-stopped - cap_add: - - NET_ADMIN - - SYS_MODULE - # - NET_RAW # ⚠️ Uncomment if using Podman Compose - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - - net.ipv6.conf.all.disable_ipv6=0 - - net.ipv6.conf.all.forwarding=1 - - net.ipv6.conf.default.forwarding=1 - -networks: - wg: - driver: bridge - enable_ipv6: true - ipam: - driver: default - config: - - subnet: 10.42.42.0/24 - - subnet: fdcc:ad94:bacf:61a3::/64 diff --git a/docker-compose.yml b/docker-compose.yml index 5a1580cf..1dc53c2a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,35 +3,21 @@ volumes: services: wg-easy: - environment: - # Change Language: - # (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi) - - LANG=de - # ⚠️ Required: - # Change this to your host's public address - - WG_HOST=raspberrypi.local + #environment: + # Optional: + # - PORT=51821 + # - HOST=0.0.0.0 + # - INSECURE=false - # Optional: - # - PASSWORD_HASH=$$2y$$10$$hBCoykrB95WSzuV4fafBzOHWKu9sbyVa34GJr8VV5R/pIelfEMYyG # (needs double $$, hash of 'foobar123'; see "How_to_generate_an_bcrypt_hash.md" for generate the hash) - # - PORT=51821 - # - WG_PORT=51820 - # - WG_CONFIG_PORT=92820 - # - WG_DEFAULT_ADDRESS=10.8.0.x - # - WG_DEFAULT_DNS=1.1.1.1 - # - WG_MTU=1420 - # - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24 - # - WG_PERSISTENT_KEEPALIVE=25 - # - WG_PRE_UP=echo "Pre Up" > /etc/wireguard/pre-up.txt - # - WG_POST_UP=echo "Post Up" > /etc/wireguard/post-up.txt - # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt - # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt - # - UI_TRAFFIC_STATS=true - # - UI_CHART_TYPE=0 # (0 Charts disabled, 1 # Line chart, 2 # Area chart, 3 # Bar chart) - - image: ghcr.io/wg-easy/wg-easy:14 + image: ghcr.io/wg-easy/wg-easy:15 container_name: wg-easy + networks: + wg: + ipv4_address: 10.42.42.42 + ipv6_address: fdcc:ad94:bacf:61a3::2a volumes: - etc_wireguard:/etc/wireguard + - /lib/modules:/lib/modules:ro ports: - "51820:51820/udp" - "51821:51821/tcp" @@ -43,3 +29,16 @@ services: sysctls: - net.ipv4.ip_forward=1 - net.ipv4.conf.all.src_valid_mark=1 + - net.ipv6.conf.all.disable_ipv6=0 + - net.ipv6.conf.all.forwarding=1 + - net.ipv6.conf.default.forwarding=1 + +networks: + wg: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + - subnet: 10.42.42.0/24 + - subnet: fdcc:ad94:bacf:61a3::/64