Dockerfile

@@ -1,14 +1,17 @@
-FROM python:3.11-alpine
+FROM python:3.11-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends curl tzdata && rm -rf /var/lib/apt/lists/*
+
+RUN pip install --no-cache-dir requests pyyaml schedule
 
 ENV TZ=Europe/Paris
 
-RUN apk add --no-cache tzdata curl \
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-    && cp /usr/share/zoneinfo/$TZ /etc/localtime \
-    && echo $TZ > /etc/timezone \
-    && pip install --no-cache-dir requests pyyaml schedule
 
 WORKDIR /app
 
-COPY blocklist_scheduler.py .
+COPY blocklist_scheduler.py /app/blocklist_scheduler.py
 
-ENTRYPOINT ["python3", "blocklist_scheduler.py"]
+RUN chmod +x /app/blocklist_scheduler.py
+
+ENTRYPOINT ["python3", "/app/blocklist_scheduler.py"]

README.md

@@ -7,10 +7,7 @@
 
 **Adguard CIDRE Sync** - A bot to synchronize adguard clients disallow list with countries CIDR list of your choices.
 
-> [!NOTE]
+*The code is partially generated by AI*
->_The code was partially written and structured using a generative AI._
->
->_Github repo is a mirror of https://git.djeex.fr/Djeex/adguard-cidre. You'll find full package, history and release note there._
 
 ## Sommaire
 
@@ -37,7 +34,7 @@
 | Variable                 | Description                                                              | Example                     | Possible Values                             |
 |--------------------------|--------------------------------------------------------------------------|-----------------------------|---------------------------------------------|
 | `TZ`                      | Timezone of the container to correctly schedule updates                | `Europe/Paris`              | Any valid timezone (e.g., `UTC`, `America/New_York`, etc.) |
-| `BLOCK_COUNTRIES`         | List of country codes for CIDR lists, separated by commas. You can also define an exclude list (all countries except the specified ones) by prefixing each country code with !. Mixing inclusion and exclusion codes is not supported.                | including list : `cn,ru,ir`, excluding list : `!cn,!ru,!ir`                  | ISO 2-letter country codes                  |
+| `BLOCK_COUNTRIES`         | List of country codes for CIDR lists, separated by commas                | `cn,ru,ir`                  | ISO 2-letter country codes                  |
 | `BLOCKLIST_CRON_TYPE`     | Scheduling type: `daily` or `weekly`                                    | `daily`                     | `daily`, `weekly`                           |
 | `BLOCKLIST_CRON_TIME`     | Time to run update in `HH:MM` 24-hour format                            | `06:00`                     | 24-hour time format                         |
 | `BLOCKLIST_CRON_DAY`      | Day of the week for weekly schedule (e.g., `mon`, `tue`, etc.)          | `mon`                       | `mon`, `tue`, `wed`, `thu`, `fri`, `sat`, `sun` |

blocklist_scheduler.py

@@ -6,7 +6,6 @@ import requests
 import yaml
 import schedule
 import time
-import re
 from pathlib import Path
 
 logging.basicConfig(
@@ -19,15 +18,14 @@ ADGUARD_YAML = Path("/adguard/AdGuardHome.yaml")
 TMP_YAML = ADGUARD_YAML.parent / (ADGUARD_YAML.name + ".tmp")
 MANUAL_IPS_FILE = Path("/adguard/manually_blocked_ips.conf")
 CIDR_BASE_URL = "https://raw.githubusercontent.com/vulnebify/cidre/main/output/cidr/ipv4"
-COUNTRY_LIST_URL = "https://raw.githubusercontent.com/vulnebify/cidre/refs/heads/main/cidre/countries.py"
 
 FIRST_BACKUP = ADGUARD_YAML.parent / "AdGuardHome.yaml.first-start.bak"
 LAST_UPDATE_BACKUP = ADGUARD_YAML.parent / "AdGuardHome.yaml.last-update.bak"
 
 BLOCK_COUNTRIES = os.getenv("BLOCK_COUNTRIES", "")
-BLOCKLIST_CRON_TYPE = os.getenv("BLOCKLIST_CRON_TYPE", "daily").lower()
+BLOCKLIST_CRON_TYPE = os.getenv("BLOCKLIST_CRON_TYPE", "daily").lower()  # daily or weekly
-BLOCKLIST_CRON_TIME = os.getenv("BLOCKLIST_CRON_TIME", "06:00")
+BLOCKLIST_CRON_TIME = os.getenv("BLOCKLIST_CRON_TIME", "06:00")  # HH:MM format
-BLOCKLIST_CRON_DAY = os.getenv("BLOCKLIST_CRON_DAY", "mon").lower()
+BLOCKLIST_CRON_DAY = os.getenv("BLOCKLIST_CRON_DAY", "mon").lower()  # only if weekly
 
 ADGUARD_CONTAINER_NAME = os.getenv("ADGUARD_CONTAINER_NAME", "adguardhome")
 DOCKER_API_URL = os.getenv("DOCKER_API_URL", "http://socket-proxy-adguard:2375")
@@ -43,44 +41,6 @@ def backup_last_update():
     logging.info(f"Creating last update backup: {LAST_UPDATE_BACKUP}")
     LAST_UPDATE_BACKUP.write_text(ADGUARD_YAML.read_text())
 
-def fetch_all_country_codes():
-    try:
-        resp = requests.get(COUNTRY_LIST_URL, timeout=15)
-        resp.raise_for_status()
-        matches = re.findall(r'"([A-Z]{2})"', resp.text)
-        return set(code.lower() for code in matches)
-    except Exception as e:
-        logging.error(f"Failed to fetch available country codes: {e}")
-        return set()
-
-def get_selected_countries():
-    if not BLOCK_COUNTRIES:
-        logging.error("BLOCK_COUNTRIES is not set. Skipping update.")
-        return []
-
-    raw_codes = [c.strip() for c in BLOCK_COUNTRIES.split(",") if c.strip()]
-    if not raw_codes:
-        logging.error("No valid country codes provided.")
-        return []
-
-    is_exclusion = all(c.startswith("!") for c in raw_codes)
-    is_inclusion = all(not c.startswith("!") for c in raw_codes)
-
-    if not (is_exclusion or is_inclusion):
-        logging.error("Mixed syntax in BLOCK_COUNTRIES. Use only inclusion (e.g. 'fr,de') or only exclusion (e.g. '!fr,!de').")
-        sys.exit(1)
-
-    available = fetch_all_country_codes()
-    selected = {c.lstrip("!") for c in raw_codes}
-    unknown = selected - available
-    if unknown:
-        logging.warning(f"Unknown country codes: {', '.join(sorted(unknown))}")
-
-    if is_exclusion:
-        return sorted(available - selected)
-    else:
-        return sorted(selected & available)
-
 def download_cidr_lists(countries):
     combined_ips = []
     for code in countries:
@@ -116,15 +76,12 @@ def update_yaml_with_ips(ips):
         logging.error(f"{ADGUARD_YAML} does not exist. Cannot update.")
         return False
 
-    try:
+    data = None
-        with ADGUARD_YAML.open() as f:
+    with ADGUARD_YAML.open() as f:
-            data = yaml.safe_load(f)
+        data = yaml.safe_load(f)
-    except Exception as e:
-        logging.error(f"Failed to parse YAML file: {e}")
-        return False
 
-    if not isinstance(data, dict):
+    if data is None:
-        logging.error("Invalid YAML format.")
+        logging.error(f"Failed to parse YAML file {ADGUARD_YAML}")
         return False
 
     data['dns']['disallowed_clients'] = ips
@@ -149,12 +106,12 @@ def restart_adguard_container():
         logging.error(f"Error restarting container: {e}")
 
 def update_blocklist():
-    countries = get_selected_countries()
+    if not BLOCK_COUNTRIES:
-    if not countries:
+        logging.error("No countries specified in BLOCK_COUNTRIES environment variable. Skipping update.")
-        logging.error("No valid countries to process. Skipping update.")
         return
 
-    cidr_ips = download_cidr_lists(countries)
+    countries_list = [c.strip() for c in BLOCK_COUNTRIES.split(",") if c.strip()]
+    cidr_ips = download_cidr_lists(countries_list)
     manual_ips = read_manual_ips()
     combined_ips = cidr_ips + manual_ips
 
@@ -175,7 +132,7 @@ def schedule_job():
         schedule.every().day.at(f"{hour:02d}:{minute:02d}").do(update_blocklist)
         logging.info(f"Scheduled daily update at {hour:02d}:{minute:02d}")
     elif BLOCKLIST_CRON_TYPE == "weekly":
-        valid_days = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"]
+        valid_days = ["mon","tue","wed","thu","fri","sat","sun"]
         day = BLOCKLIST_CRON_DAY[:3]
         if day not in valid_days:
             logging.error(f"Invalid BLOCKLIST_CRON_DAY '{BLOCKLIST_CRON_DAY}', must be one of {valid_days}. Defaulting to Monday.")
@@ -189,7 +146,9 @@ def schedule_job():
 
 def main():
     logging.info("Starting blocklist scheduler...")
+
     backup_first_start()
+
     update_blocklist()
     schedule_job()
     while True: