From e4252d0596e0c5372dac92caddde050b32b3bfc8 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Thu, 2 Jan 2025 10:37:18 +0800 Subject: [PATCH] update caddy --- CHANGELOG.md | 5 +++++ DEV-VERSION | 2 +- docker/dockerfile/dev/Dockerfile | 4 ++-- docker/dockerfile/release/Dockerfile | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82d3b96..1825be6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +25w01b +--- +- PRE-RELEASE: 此版本是v1.8.0的预发布版本,请勿在生产环境中使用 +- CHANGE: 将底包更新至`v2.9.0` + 25w01a --- - PRE-RELEASE: 此版本是v1.8.0的预发布版本,请勿在生产环境中使用; 同时,这也是2025年的第一个pre-release版本,祝各位新年快乐! (同时,请注意版本号的变化) diff --git a/DEV-VERSION b/DEV-VERSION index d5f6ac9..2f8a75c 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -25w01a \ No newline at end of file +25w01b \ No newline at end of file diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index 465ac6b..5fa5637 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:v24.12.20-alpine AS builder +FROM wjqserver/caddy:2.9.0-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:v24.12.20-alpine +FROM wjqserver/caddy:2.9.0-alpine RUN apk add --no-cache curl diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index eb750df..3b2302e 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:v24.12.20-alpine AS builder +FROM wjqserver/caddy:2.9.0-alpine AS builder ARG USER=WJQSERVER-STUDIO ARG REPO=ghproxy @@ -36,7 +36,7 @@ RUN wget -O /data/${APPLICATION}/whitelist.json https://raw.githubusercontent.co RUN chmod +x /data/${APPLICATION}/${APPLICATION} RUN chmod +x /usr/local/bin/init.sh -FROM wjqserver/caddy:v24.12.20-alpine +FROM wjqserver/caddy:2.9.0-alpine RUN apk add --no-cache curl