caddy 2.10.2

caddy/build.txt → caddy/DockerBuilder.txt

@@ -6,7 +6,7 @@ tmux attach-session -t dbx
 
 #git clone https://gogs.tods.eu.org/ApqTeam/DockerImg
 
-cd DockerImg/caddy/
+cd dockerimg/caddy/
 
 
 ### 创建构建实例
@@ -25,7 +25,7 @@ docker buildx create --use --name build --node build --driver docker-container -
 
 docker buildx build --platform linux/amd64,linux/arm64 \
 -t amwpfiqvy/caddy \
--t amwpfiqvy/caddy:2.7.6 \
+-t amwpfiqvy/caddy:2.10.2 \
 . --push
 
 ### end 构建并推送
@@ -50,21 +50,21 @@ docker rmi registry.cn-chengdu.aliyuncs.com/apq/caddy:arm64
 -- 以下为按架构分别构建 ----------------------------------------------------------------
 
 # amd64上构建并推送
-docker build -t amwpfiqvy/caddy:2.7.6_amd64 .
-docker push amwpfiqvy/caddy:2.7.6_amd64
+docker build -t amwpfiqvy/caddy:2.10.2_amd64 .
+docker push amwpfiqvy/caddy:2.10.2_amd64
 
 # arm64上构建并推送
-docker build -t amwpfiqvy/caddy:2.7.6_arm64 .
-docker push amwpfiqvy/caddy:2.7.6_arm64
+docker build -t amwpfiqvy/caddy:2.10.2_arm64 .
+docker push amwpfiqvy/caddy:2.10.2_arm64
 
 # 任意机器上构建版本标签与latest标签并推送
-docker manifest create amwpfiqvy/caddy:2.7.6 \
-    amwpfiqvy/caddy:2.7.6_amd64 \
-    amwpfiqvy/caddy:2.7.6_arm64
-docker manifest push amwpfiqvy/caddy:2.7.6
+docker manifest create amwpfiqvy/caddy:2.10.2 \
+    amwpfiqvy/caddy:2.10.2_amd64 \
+    amwpfiqvy/caddy:2.10.2_arm64
+docker manifest push amwpfiqvy/caddy:2.10.2
 
 #docker manifest rm amwpfiqvy/caddy
 docker manifest create amwpfiqvy/caddy \
-    amwpfiqvy/caddy:2.7.6_amd64 \
-    amwpfiqvy/caddy:2.7.6_arm64
+    amwpfiqvy/caddy:2.10.2_amd64 \
+    amwpfiqvy/caddy:2.10.2_arm64
 docker manifest push amwpfiqvy/caddy

caddy/downloader.bash

@@ -9,7 +9,7 @@
 archStr=$(dpkg --print-architecture)
 
 if [ "${archStr}"x == "arm64"x ]; then
-    curlDown "/app" caddy "https://caddyserver.com/api/download?os=linux&arch=arm64&p=github.com%2Fcaddy-dns%2Fcloudflare&p=github.com%2Fdunglas%2Fmercure%2Fcaddy&p=github.com%2Fdunglas%2Fvulcain%2Fcaddy&p=github.com%2Fcaddyserver%2Ftransform-encoder&p=github.com%2Fcaddyserver%2Freplace-response&p=github.com%2Fcaddy-dns%2Froute53&p=github.com%2Fmholt%2Fcaddy-webdav&p=github.com%2Fgreenpau%2Fcaddy-security&p=github.com%2Fcaddy-dns%2Fduckdns&p=github.com%2Fcaddy-dns%2Fdnspod&p=github.com%2Fimgk%2Fcaddy-trojan&p=github.com%2Fporech%2Fcaddy-maxmind-geolocation&p=github.com%2Fkirsch33%2Frealip&p=github.com%2Fcaddy-dns%2Falidns&p=github.com%2FWingLim%2Fcaddy-webhook&idempotency=5815992748437"
+    curlDown "/app" caddy "https://caddyserver.com/api/download?os=linux&arch=arm64&p=github.com%2Fgreenpau%2Fcaddy-security&p=github.com%2Fcaddy-dns%2Fcloudflare&p=github.com%2Fdunglas%2Fvulcain%2Fcaddy&p=github.com%2Fdunglas%2Fmercure%2Fcaddy&p=github.com%2Fcaddyserver%2Freplace-response&p=github.com%2Fcaddyserver%2Ftransform-encoder&p=github.com%2Fmholt%2Fcaddy-webdav&p=github.com%2Fcaddy-dns%2Fduckdns&p=github.com%2Fmholt%2Fcaddy-dynamicdns&p=github.com%2Fgreenpau%2Fcaddy-trace&p=github.com%2Fmholt%2Fcaddy-l4&p=github.com%2Fabiosoft%2Fcaddy-exec&p=github.com%2FWeidiDeng%2Fcaddy-cloudflare-ip&p=github.com%2Fporech%2Fcaddy-maxmind-geolocation&p=github.com%2Fcaddy-dns%2Falidns&p=github.com%2Fabiosoft%2Fcaddy-json-parse&p=github.com%2Fcaddyserver%2Fnginx-adapter&p=github.com%2FWingLim%2Fcaddy-webhook&p=github.com%2Fshift72%2Fcaddy-geo-ip&idempotency=13342562853553"
 else
-    curlDown "/app" caddy "https://caddyserver.com/api/download?os=linux&arch=amd64&p=github.com%2Fcaddy-dns%2Fcloudflare&p=github.com%2Fdunglas%2Fmercure%2Fcaddy&p=github.com%2Fdunglas%2Fvulcain%2Fcaddy&p=github.com%2Fcaddyserver%2Ftransform-encoder&p=github.com%2Fcaddyserver%2Freplace-response&p=github.com%2Fcaddy-dns%2Froute53&p=github.com%2Fmholt%2Fcaddy-webdav&p=github.com%2Fgreenpau%2Fcaddy-security&p=github.com%2Fcaddy-dns%2Fduckdns&p=github.com%2Fcaddy-dns%2Fdnspod&p=github.com%2Fimgk%2Fcaddy-trojan&p=github.com%2Fporech%2Fcaddy-maxmind-geolocation&p=github.com%2Fkirsch33%2Frealip&p=github.com%2Fcaddy-dns%2Falidns&p=github.com%2FWingLim%2Fcaddy-webhook&idempotency=83904614959909"
+    curlDown "/app" caddy "https://caddyserver.com/api/download?os=linux&arch=amd64&p=github.com%2Fgreenpau%2Fcaddy-security&p=github.com%2Fcaddy-dns%2Fcloudflare&p=github.com%2Fdunglas%2Fvulcain%2Fcaddy&p=github.com%2Fdunglas%2Fmercure%2Fcaddy&p=github.com%2Fcaddyserver%2Freplace-response&p=github.com%2Fcaddyserver%2Ftransform-encoder&p=github.com%2Fmholt%2Fcaddy-webdav&p=github.com%2Fcaddy-dns%2Fduckdns&p=github.com%2Fmholt%2Fcaddy-dynamicdns&p=github.com%2Fgreenpau%2Fcaddy-trace&p=github.com%2Fmholt%2Fcaddy-l4&p=github.com%2Fabiosoft%2Fcaddy-exec&p=github.com%2FWeidiDeng%2Fcaddy-cloudflare-ip&p=github.com%2Fporech%2Fcaddy-maxmind-geolocation&p=github.com%2Fcaddy-dns%2Falidns&p=github.com%2Fabiosoft%2Fcaddy-json-parse&p=github.com%2Fcaddyserver%2Fnginx-adapter&p=github.com%2FWingLim%2Fcaddy-webhook&p=github.com%2Fshift72%2Fcaddy-geo-ip&idempotency=48028808842973"
 fi

caddy_apqc/DockerBuilder.txt

@@ -0,0 +1,72 @@
+
+# 新开一个会话(dbx),在此会话中编译
+tmux new -s dbx
+# 切换到dbx会话
+tmux attach-session -t dbx
+# 退出dbx会话
+tmux detach
+
+#git clone https://gogs.tods.gq/ApqTeam/dockerimg
+
+cd dockerimg/caddy_apqc/
+
+
+### 创建构建实例
+
+
+# 如果已存在,可以先删除
+docker buildx ls
+docker buildx rm build -f
+
+docker buildx create --use --name build --node build --driver docker-container --driver-opt network=host
+
+### end 创建构建实例
+
+
+### 构建并推送
+
+docker buildx build --platform linux/amd64,linux/arm64 \
+-t amwpfiqvy/caddy \
+-t amwpfiqvy/caddy:2.10.2 \
+. --push
+
+### end 构建并推送
+
+-- 推送到阿里云 -----------------------------------------------------------------------
+docker login [email protected] registry.cn-chengdu.aliyuncs.com
+
+# amd64上
+docker rmi amwpfiqvy/caddy
+docker pull amwpfiqvy/caddy
+docker tag amwpfiqvy/caddy registry.cn-chengdu.aliyuncs.com/apq/caddy:amd64
+docker push registry.cn-chengdu.aliyuncs.com/apq/caddy:amd64
+docker rmi registry.cn-chengdu.aliyuncs.com/apq/caddy:amd64
+
+# arm64上
+docker rmi amwpfiqvy/caddy
+docker pull amwpfiqvy/caddy
+docker tag amwpfiqvy/caddy registry.cn-chengdu.aliyuncs.com/apq/caddy:arm64
+docker push registry.cn-chengdu.aliyuncs.com/apq/caddy:arm64
+docker rmi registry.cn-chengdu.aliyuncs.com/apq/caddy:arm64
+
+-- 以下为按架构分别构建 ----------------------------------------------------------------
+
+# amd64上构建并推送
+docker build -t amwpfiqvy/caddy:2.10.2_amd64 .
+docker push amwpfiqvy/caddy:2.10.2_amd64
+
+# arm64上构建并推送
+docker build -t amwpfiqvy/caddy:2.10.2_arm64 .
+docker push amwpfiqvy/caddy:2.10.2_arm64
+
+# 任意机器上构建版本标签与latest标签并推送
+docker manifest create amwpfiqvy/caddy:2.10.2 \
+    amwpfiqvy/caddy:2.10.2_amd64 \
+    amwpfiqvy/caddy:2.10.2_arm64
+docker manifest push amwpfiqvy/caddy:2.10.2
+
+#docker manifest rm amwpfiqvy/caddy
+docker manifest create amwpfiqvy/caddy \
+    amwpfiqvy/caddy:2.10.2_amd64 \
+    amwpfiqvy/caddy:2.10.2_arm64
+docker manifest push amwpfiqvy/caddy

caddy_apqc/Dockerfile

@@ -1,30 +1,39 @@
-# syntax=docker/dockerfile:1
 FROM caddy:builder AS builder
 RUN xcaddy build \
-    # 已集成,不再需要添加了
-    # --with github.com/mastercactapus/caddy2-proxyprotocol \
     # 用于直接使用Nginx的配置,解析nginx.conf文件，然后转换为json 格式
-    # --with github.com/caddyserver/nginx-adapter \
-    # --with github.com/abiosoft/caddy-json-parse \
+    --with github.com/caddyserver/nginx-adapter \
+	# 支持接收代理协议，官方已集成
+    # --with github.com/mastercactapus/caddy2-proxyprotocol \
+	# 官方编译站点中找不到这个
+    # --with github.com/hadi77ir/caddy-websockify \
+    --with github.com/caddyserver/replace-response \
     # 用于对响应的body执行子字符串或正则表达式替换
-    # --with github.com/caddyserver/replace-response \
-    # --with github.com/mholt/caddy-webdav \
-    # --with github.com/mholt/caddy-l4 \
-    # --with github.com/mholt/caddy-dynamicdns \
-    # --with github.com/abiosoft/caddy-exec \
-    # --with github.com/greenpau/caddy-trace \
-    # --with github.com/greenpau/caddy-security \
-    # --with github.com/porech/caddy-maxmind-geolocation \
-    # --with github.com/shift72/caddy-geo-ip \
-    # --with github.com/imgk/caddy-trojan \
-    # --with github.com/caddyserver/forwardproxy@caddy2=github.com/klzgrad/forwardproxy@naive \
-    # --with github.com/kirsch33/realip \
-    # --with github.com/caddy-dns/duckdns \
+    --with github.com/caddyserver/transform-encoder \
+    --with github.com/abiosoft/caddy-json-parse \
+	# 支持在更低网络层次上的处理
+    --with github.com/mholt/caddy-l4 \
+    --with github.com/mholt/caddy-dynamicdns \
+    --with github.com/abiosoft/caddy-exec \
+    --with github.com/greenpau/caddy-trace \
+    --with github.com/porech/caddy-maxmind-geolocation \
+    --with github.com/shift72/caddy-geo-ip \
+    --with github.com/caddy-dns/cloudflare \
+    --with github.com/WeidiDeng/caddy-cloudflare-ip \
+    --with github.com/dunglas/mercure/caddy \
+    --with github.com/dunglas/vulcain/caddy \
+    --with github.com/mholt/caddy-webdav \
+    --with github.com/greenpau/caddy-security \
+    --with github.com/WingLim/caddy-webhook \
     # --with github.com/caddy-dns/route53 \
-    # --with github.com/caddy-dns/cloudflare \
-    # --with github.com/caddy-dns/alidns \
     # --with github.com/caddy-dns/dnspod \
-    --with github.com/hadi77ir/caddy-websockify
+    --with github.com/caddy-dns/alidns \
+    --with github.com/caddy-dns/duckdns
 
 FROM caddy
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+
+# 暴露端口
+EXPOSE 80 443 8443
+
+# 设置启动命令
+CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]

caddy_apqc/build.txt

@@ -1,49 +0,0 @@
-
-# 新开一个会话(dbx),在此会话中编译
-tmux new -s dbx
-# 切换到dbx会话
-tmux attach-session -t dbx
-
-#git clone https://gogs.tods.gq/ApqTeam/DockerImg
-
-cd DockerImg/caddy_apqc/
-
-
-### 创建构建实例
-
-# 如果已存在,可以先删除
-docker buildx ls
-docker buildx rm build -f
-
-docker buildx create --use --name build --node build --driver docker-container --driver-opt network=host
-
-### end 创建构建实例
-
-
-### 构建并推送
-
-docker buildx build --platform linux/amd64,linux/arm64 -t amwpfiqvy/caddy:2.7.6_apqc . --push
-
-### end 构建并推送
-
--- 以下为按架构分别构建 ----------------------------------------------------------------
-
-# amd64上构建并推送
-docker build -t amwpfiqvy/caddy:amd64 .
-docker push amwpfiqvy/caddy:amd64
-
-# arm64上构建并推送
-docker build -t amwpfiqvy/caddy:arm64 .
-docker push amwpfiqvy/caddy:arm64
-
-# 任意机器上构建latest标签并推送
-#docker manifest rm amwpfiqvy/caddy
-docker manifest create amwpfiqvy/caddy \
-    amwpfiqvy/caddy:amd64 \
-    amwpfiqvy/caddy:arm64
-docker manifest push amwpfiqvy/caddy
-
--- 推送到阿里云 -----------------------------------------------------------------------
-docker login --username=Apq@apq registry.cn-chengdu.aliyuncs.com
-docker tag d24718fc00bd registry.cn-chengdu.aliyuncs.com/apq/caddy:amd64
-docker tag 8306779e0c13 registry.cn-chengdu.aliyuncs.com/apq/caddy:arm64