diff --git a/Dockerfile b/Dockerfile index d84bb26..0e687fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest -RUN apk add --no-cache curl bash busybox-cron +RUN apk add --no-cache curl bash busybox-cron tzdata COPY update-blocklist.sh /usr/local/bin/update-blocklist.sh COPY entrypoint.sh /entrypoint.sh diff --git a/README.md b/README.md index 412663f..198e3c7 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,10 @@ | Variable | Description | Default | | ------------------- | ---------------------------------------------------------- | --------------------------------- | +| `TZ` | Your Time Zone | (required) | | `BLOCK_COUNTRIES` | Comma-separated country codes to block (e.g., `CN,RU,IR`) | (required) | | `BLOCKLIST_CRON` | Cron expression for update frequency (e.g., `0 6 * * *`) | `0 6 * * *` (at 6:00 everydays) | -| `DOCKER_API_URL` | URL of Docker socket proxy to restart AdGuard container | `http://docker-socket-proxy:2375` | +| `DOCKER_API_URL` | URL of Docker socket proxy to restart AdGuard container | `tcp://socket-proxy-adguard:2375` | ## File Structure diff --git a/docker-compose.yml b/docker-compose.yml index 9eeab34..dde3cd0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,10 @@ services: adguard-cidre: build: . environment: + - 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=tcp://socket-proxy-adguard:2375 volumes: - /path/to/adguard/confdir:/adguard diff --git a/entrypoint.sh b/entrypoint.sh index 249a0ce..a9bdaf0 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,6 +2,11 @@ set -e +if [ -n "$TZ" ]; then + cp /usr/share/zoneinfo/$TZ /etc/localtime + echo "$TZ" > /etc/timezone +fi + CRON_EXPR="${BLOCKLIST_CRON:-"0 6 * * *"}" # default: every hour SCRIPT_PATH="/usr/local/bin/update-blocklist.sh" diff --git a/update-blocklist.sh b/update-blocklist.sh index 33a4ff8..0dc4c4b 100644 --- a/update-blocklist.sh +++ b/update-blocklist.sh @@ -7,7 +7,7 @@ TMP_YAML="/tmp/AdGuardHome.yaml" 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://docker-socket-proxy:2375"} +DOCKER_API_URL=${DOCKER_API_URL:-"tcp://socket-proxy-adguard:2375"} if [ -z "$COUNTRIES" ]; then echo "No countries specified in BLOCK_COUNTRIES."