Merge branch 'development' into main

fix: resolve merge conflict in go.work.sum for geoip2-golang dependency
fix: upgrade c-ares to address CVE-2025-62408 and add MaxMind GeoLite2 configuration files
2025-12-16 09:57:37 -05:00 · 2025-12-16 14:52:43 +00:00 · 2025-12-16 14:47:48 +00:00 · 2025-12-15 01:38:35 -05:00
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@@ -244,9 +244,11 @@ FROM ${CADDY_IMAGE}
 WORKDIR /app

 # Install runtime dependencies for Charon (no bash needed)
+# Explicitly upgrade c-ares to fix CVE-2025-62408
 # hadolint ignore=DL3018
 RUN apk --no-cache add ca-certificates sqlite-libs tzdata curl gettext \
-    && apk --no-cache upgrade
+    && apk --no-cache upgrade \
+    && apk --no-cache upgrade c-ares

 # Download MaxMind GeoLite2 Country database
 # Note: In production, users should provide their own MaxMind license key
Author	SHA1	Message	Date
Jeremy	0732b9da5c	Merge branch 'development' into main	2025-12-16 09:57:37 -05:00
GitHub Actions	2b78c811d8	fix: resolve merge conflict in go.work.sum for geoip2-golang dependency	2025-12-16 14:52:43 +00:00
GitHub Actions	53f3e44999	fix: upgrade c-ares to address CVE-2025-62408 and add MaxMind GeoLite2 configuration files	2025-12-16 14:47:48 +00:00
Jeremy	3485768c61	Merge pull request #402 from Wikid82/main Propagate changes from main into development	2025-12-15 01:38:35 -05:00