diff --git a/CHANGELOG.md b/CHANGELOG.md index 52b1932..49b67a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +24w27e +--- +- PRE-RELEASE: 此版本是v1.7.8的预发布候选版本,请勿在生产环境中使用 +- CHANGE: 更新底包至`v24.12.20`可能解决部分与`caddy`相关的内存问题 + 24w27d --- - PRE-RELEASE: 此版本是v1.7.8的预发布候选版本,请勿在生产环境中使用 diff --git a/docker/dockerfile/dev/Dockerfile b/docker/dockerfile/dev/Dockerfile index a495223..465ac6b 100644 --- a/docker/dockerfile/dev/Dockerfile +++ b/docker/dockerfile/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-beta.3-alpine AS builder +FROM wjqserver/caddy:v24.12.20-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:2.9.0-beta.3-alpine +FROM wjqserver/caddy:v24.12.20-alpine RUN apk add --no-cache curl diff --git a/docker/dockerfile/release/Dockerfile b/docker/dockerfile/release/Dockerfile index 86c8c7e..eb750df 100644 --- a/docker/dockerfile/release/Dockerfile +++ b/docker/dockerfile/release/Dockerfile @@ -1,4 +1,4 @@ -FROM wjqserver/caddy:2.9.0-beta.3-alpine AS builder +FROM wjqserver/caddy:v24.12.20-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:2.9.0-beta.3-alpine +FROM wjqserver/caddy:v24.12.20-alpine RUN apk add --no-cache curl