disable openvpn and expose all geoip info

2024-11-24 15:52:58 +01:00
parent 788deb93a1
commit 494694f317
4 changed files with 74 additions and 63 deletions
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -3,16 +3,13 @@ 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
+
+