Merge branch 'main' into mwoffliner_1_14

dispatcher/backend/maint-scripts/create_ted_topics_recipes.py

@@ -49,7 +49,7 @@ def get_ted_topics():
 
 
 def create_recipe(ted_topic_name: str, access_token):
-    clean_ted_topic_name = ted_topic_name.replace(" ", "-")
+    clean_ted_topic_name = ted_topic_name.replace(" ", "-").replace("'", "")
     schedule_name = f"ted_topic_{clean_ted_topic_name}"
     response = requests.get(
         get_url(f"/schedules/{schedule_name}"),
@@ -125,7 +125,8 @@ def main(zf_username, zf_password):
     access_token, refresh_token = get_token(zf_username, zf_password)
 
     ted_topics = get_ted_topics()
-    logger.debug(ted_topics)
+    logger.debug(",".join((ted_topics)))
+    logger.debug(",".join(sorted(ted_topics)))
     for topic in ted_topics:
         if topic != "street art":
             continue

receiver/Dockerfile

@@ -48,7 +48,7 @@ VOLUME /mnt/quarantine
 VOLUME /mnt/zim
 VOLUME /mnt/check_logs
 
-ENV ZIM_TOOLS_URL https://download.openzim.org/release/zim-tools/zim-tools_linux-x86_64-3.4.1.tar.gz
+ENV ZIM_TOOLS_URL https://download.openzim.org/release/zim-tools/zim-tools_linux-x86_64-3.4.2.tar.gz
 ENV ZIM_SRC_DIR /jail/zim
 ENV ZIM_DST_DIR /mnt/zim
 ENV ZIM_QUAR_DIR /mnt/quarantine

workers/app/common/constants.py

@@ -23,7 +23,7 @@
 )
 DNSCACHE_IMAGE = os.getenv("DNSCACHE_IMAGE") or "ghcr.io/openzim/dnscache:latest"
 UPLOADER_IMAGE = os.getenv("UPLOADER_IMAGE") or "ghcr.io/openzim/uploader:latest"
-CHECKER_IMAGE = os.getenv("CHECKER_IMAGE") or "ghcr.io/openzim/zim-tools:3.4.1"
+CHECKER_IMAGE = os.getenv("CHECKER_IMAGE") or "ghcr.io/openzim/zim-tools:3.4.2"
 MONITOR_IMAGE = os.getenv("MONITOR_IMAGE") or "ghcr.io/openzim/zimfarm-monitor:latest"
 
 # paths