Djeex/adguard-cidre
1
1
Fork 0
Code Issues Pull Requests Packages Releases 5 Activity

wip - v1 => It's working !! #1

Merged
Djeex merged 9 commits from wip into main 2025-05-31 19:44:49 +02:00
Conversation 0 Commits 9 Files Changed 5 +8 -16
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d465082a5 - Show all commits

2
Dockerfile
View File

@@ -1,6 +1,6 @@
FROM alpine:latest FROM alpine:latest
RUN apk add --no-cache curl bash dcron tzdata RUN apk add --no-cache curl bash busybox tzdata
COPY update-blocklist.sh /usr/local/bin/update-blocklist.sh COPY update-blocklist.sh /usr/local/bin/update-blocklist.sh
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh

2
README.md
View File

@@ -31,7 +31,7 @@
| `TZ` | Your Time Zone | (required) | | `TZ` | Your Time Zone | (required) |
| `BLOCK_COUNTRIES` | Comma-separated country codes to block (e.g., `CN,RU,IR`) | (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) | | `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 | `tcp://socket-proxy-adguard:2375` | | `DOCKER_API_URL` | URL of Docker socket proxy to restart AdGuard container | `http://socket-proxy-adguard:2375` |
## File Structure ## File Structure

2
docker-compose.yml
View File

@@ -6,7 +6,7 @@ services:
- TZ=Europe/Paris # change to your timezone - 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 - 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 - BLOCKLIST_CRON=0 6 * * * # at 6:00 every days
- DOCKER_API_URL=tcp://socket-proxy-adguard:2375 - DOCKER_API_URL=http://socket-proxy-adguard:2375
volumes: volumes:
- /path/to/adguard/confdir:/adguard - /path/to/adguard/confdir:/adguard

14
entrypoint.sh
View File

@@ -1,22 +1,14 @@
#!/bin/sh #!/bin/sh
set -e set -e
if [ -n "$TZ" ]; then if [ -n "$TZ" ]; then
if [ -f "/usr/share/zoneinfo/$TZ" ]; then if [ -f "/usr/share/zoneinfo/$TZ" ]; then
cp "/usr/share/zoneinfo/$TZ" /etc/localtime cp "/usr/share/zoneinfo/$TZ" /etc/localtime
echo "$TZ" > /etc/timezone echo "$TZ" > /etc/timezone
else
echo "Warning: Timezone file /usr/share/zoneinfo/$TZ not found, skipping timezone setup."
fi fi
fi fi
CRON_EXPR="${BLOCKLIST_CRON:-"0 6 * * *"}" # default: every day at 6:00 am CRON_EXPR="${BLOCKLIST_CRON:-"0 6 * * *"}"
SCRIPT_PATH="/usr/local/bin/update-blocklist.sh" echo "$CRON_EXPR /usr/local/bin/update-blocklist.sh" > /etc/crontabs/root
echo "Installing cron job with expression: $CRON_EXPR" exec crond -f -c /etc/crontabs
echo "$CRON_EXPR root $SCRIPT_PATH" > /etc/crontabs/root
echo "Starting cron..."
exec crond -f -L /dev/stdout

2
update-blocklist.sh
View File

@@ -7,7 +7,7 @@ TMP_YAML="/tmp/AdGuardHome.yaml"
MANUAL_IPS_FILE="/adguard/manually_blocked_ips.conf" MANUAL_IPS_FILE="/adguard/manually_blocked_ips.conf"
CIDR_BASE_URL="https://raw.githubusercontent.com/vulnebify/cidre/main/output/cidr/ipv4" CIDR_BASE_URL="https://raw.githubusercontent.com/vulnebify/cidre/main/output/cidr/ipv4"
COUNTRIES=${BLOCK_COUNTRIES:-""} COUNTRIES=${BLOCK_COUNTRIES:-""}
DOCKER_API_URL=${DOCKER_API_URL:-"tcp://socket-proxy-adguard:2375"} DOCKER_API_URL=${DOCKER_API_URL:-"http://socket-proxy-adguard:2375"}
if [ -z "$COUNTRIES" ]; then if [ -z "$COUNTRIES" ]; then
echo "No countries specified in BLOCK_COUNTRIES." echo "No countries specified in BLOCK_COUNTRIES."