diff --git a/docker-compose.yml b/docker-compose.yml index 67643ac..3c7d043 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,8 @@ services: - TZ=Europe/Paris # change to your timezone - BLOCK_COUNTRIES=CN,RU,IR # choose countries listed IP to block. Full lists here https://github.com/vulnebify/cidre/tree/main/output/cidr/ipv4 - BLOCKLIST_CRON=0 6 * * * # at 6:00 every days - - DOCKER_API_URL=http://socket-proxy-adguard:2375 + - DOCKER_API_URL=http://socket-proxy-adguard:2375 # docker socket proxy + - ADGUARD_CONTAINER_NAME=adguardhome # adguard container name volumes: - /path/to/adguard/confdir:/adguard @@ -17,6 +18,7 @@ services: - no-new-privileges:true environment: - CONTAINERS=1 + - ALLOW_RESTARTS=1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro restart: unless-stopped diff --git a/update-blocklist.sh b/update-blocklist.sh index 7c06ad5..1ee035f 100644 --- a/update-blocklist.sh +++ b/update-blocklist.sh @@ -8,6 +8,7 @@ MANUAL_IPS_FILE="/adguard/manually_blocked_ips.conf" CIDR_BASE_URL="https://raw.githubusercontent.com/vulnebify/cidre/main/output/cidr/ipv4" COUNTRIES=${BLOCK_COUNTRIES:-""} DOCKER_API_URL=${DOCKER_API_URL:-"http://socket-proxy-adguard:2375"} +ADGUARD_CONTAINER_NAME=${ADGUARD_CONTAINER_NAME:-"adguardhome"} if [ -z "$COUNTRIES" ]; then echo "No countries specified in BLOCK_COUNTRIES." @@ -42,6 +43,6 @@ END { if (inside==1) print ips } mv "$TMP_YAML" "$ADGUARD_YAML" echo "Restarting adguard-home container..." -curl -s -X POST "$DOCKER_API_URL/containers/adguard-home/restart" -o /dev/null +curl -s -X POST "$DOCKER_API_URL/containers/$ADGUARD_CONTAINER_NAME/restart" -o /dev/null echo "Done."