diff --git a/adguardhome/docker-compose.yml b/adguardhome/docker-compose.yml index 6ef94a2..7136086 100644 --- a/adguardhome/docker-compose.yml +++ b/adguardhome/docker-compose.yml @@ -5,6 +5,8 @@ services: image: modem7/dhcprelay:latest container_name: dhcp-relay restart: always + depends_on: + - adguardhome command: ["-id", "enp2s0", "-iu", "br_adguard", "10.0.0.10"] cap_add: - NET_ADMIN @@ -18,10 +20,11 @@ services: networks: adguardhome: ipv4_address: 10.0.0.10 - docker-compose-nas: + default: ports: - "53:53/tcp" - "53:53/udp" + - "67:67/tcp" - "68:68/tcp" - "68:68/udp" - "853:853/tcp" diff --git a/flaresolverr/docker-compose.yml b/flaresolverr/docker-compose.yml index 28d8700..e90202a 100644 --- a/flaresolverr/docker-compose.yml +++ b/flaresolverr/docker-compose.yml @@ -5,8 +5,6 @@ services: image: ghcr.io/flaresolverr/flaresolverr:latest container_name: flaresolverr restart: always - networks: - docker-compose-nas: environment: - LOG_LEVEL=${LOG_LEVEL:-info} - LOG_HTML=${LOG_HTML:-false} @@ -17,7 +15,3 @@ services: - traefik.http.routers.flaresolverr.rule=PathPrefix(`/flaresolverr`) - traefik.http.routers.flaresolverr.tls=true - traefik.http.services.flaresolverr.loadbalancer.server.port=8191 - -networks: - docker-compose-nas: - external: true