experiment with geoip in caddy

2024-11-22 11:44:38 +01:00
parent d9fa0659ff
commit eb6d56c2be
6 changed files with 63 additions and 35 deletions
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -3,11 +3,16 @@ FROM caddy:2.9-builder AS builder
 RUN xcaddy build \
    --with github.com/caddy-dns/route53 \
    --with github.com/mholt/caddy-dynamicdns \
+<<<<<<< HEAD
    --with github.com/zhangjiayin/caddy-geoip2
    #--with github.com/shift72/caddy-geo-ip \
    #--with github.com/aablinov/caddy-geoip \
    #--with github.com/porech/caddy-maxmind-geolocation
+=======
+    --with github.com/shift72/caddy-geo-ip \
+    --with github.com/porech/caddy-maxmind-geolocation
+
+>>>>>>> e0b5673 (experiment with geoip in caddy)
 FROM caddy:2.9-alpine

 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
-