From 55d2c11c6f157a819bd7ad277acbb1c1bb55a4db Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Mon, 15 Jun 2026 14:12:47 +0800 Subject: [PATCH 1/4] fix: solve bugs in zadig backend image Signed-off-by: YuTang Song <2313186065@qq.com> --- docker/aslan.Dockerfile | 27 ++++++++++++--------------- docker/cron.Dockerfile | 11 ++++++----- docker/executor.Dockerfile | 11 ++++++----- docker/hub-agent.Dockerfile | 11 ++++++----- docker/hub-server.Dockerfile | 11 ++++++----- docker/init.Dockerfile | 11 ++++++----- docker/ua.Dockerfile | 13 +++++++------ docker/user.Dockerfile | 11 ++++++----- 8 files changed, 55 insertions(+), 51 deletions(-) diff --git a/docker/aslan.Dockerfile b/docker/aslan.Dockerfile index 4b0e831b00..16b19e3d8f 100644 --- a/docker/aslan.Dockerfile +++ b/docker/aslan.Dockerfile @@ -17,25 +17,22 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /aslan ./cmd/aslan/main.go -FROM alpine/git:v2.36.3 +FROM alpine:3.20 ENV VERSION=1.4.0 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ - apk del tzdata - -RUN apk update -RUN apk --no-cache add curl curl-dev - -# install ali-acr plugin -RUN curl -fsSL "https://resources.koderover.com/helm-acr_0.8.2_linux_amd64.tar.gz" -o helm-acr.tar.gz &&\ - mkdir -p /app/.helm/helmplugin/helm-acr &&\ - tar -xvzf helm-acr.tar.gz -C /app/.helm/helmplugin/helm-acr &&\ - rm -rf helm-acr* +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates; \ + apk add --no-cache --virtual .fetch-deps curl tar tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ + curl -fsSL "https://resources.koderover.com/helm-acr_0.8.2_linux_amd64.tar.gz" -o /tmp/helm-acr.tar.gz; \ + mkdir -p /app/.helm/helmplugin/helm-acr; \ + tar -xzf /tmp/helm-acr.tar.gz -C /app/.helm/helmplugin/helm-acr; \ + rm -f /tmp/helm-acr.tar.gz; \ + apk del .fetch-deps WORKDIR /app diff --git a/docker/cron.Dockerfile b/docker/cron.Dockerfile index aba614fd4d..772e21b7c6 100644 --- a/docker/cron.Dockerfile +++ b/docker/cron.Dockerfile @@ -17,13 +17,14 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /cron ./cmd/cron/main.go -FROM alpine/git:v2.30.2 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata WORKDIR /app diff --git a/docker/executor.Dockerfile b/docker/executor.Dockerfile index 203e14bcd2..7e06d0b7fa 100644 --- a/docker/executor.Dockerfile +++ b/docker/executor.Dockerfile @@ -19,15 +19,16 @@ RUN --mount=type=cache,id=gobuild,target=/gocache \ RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /jobexecutor ./cmd/jobexecutor/main.go -FROM alpine:3.18.0 +FROM alpine:3.20 WORKDIR /app # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata COPY --from=build /reaper . diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile index 97f05cd068..dc0f259f34 100644 --- a/docker/hub-agent.Dockerfile +++ b/docker/hub-agent.Dockerfile @@ -17,13 +17,14 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /hub-agent ./cmd/hub-agent/main.go -FROM alpine/git:v2.30.2 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata WORKDIR /app diff --git a/docker/hub-server.Dockerfile b/docker/hub-server.Dockerfile index 6866d0511b..6ce34119e7 100644 --- a/docker/hub-server.Dockerfile +++ b/docker/hub-server.Dockerfile @@ -17,13 +17,14 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /hub-server ./cmd/hub-server/main.go -FROM alpine:3.13.5 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata WORKDIR /app diff --git a/docker/init.Dockerfile b/docker/init.Dockerfile index 1a8c0f9123..34d22613d1 100644 --- a/docker/init.Dockerfile +++ b/docker/init.Dockerfile @@ -17,13 +17,14 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /init ./cmd/init/main.go -FROM alpine:3.13.5 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata WORKDIR /app diff --git a/docker/ua.Dockerfile b/docker/ua.Dockerfile index dd5b7df31f..25a603b1c0 100644 --- a/docker/ua.Dockerfile +++ b/docker/ua.Dockerfile @@ -17,13 +17,14 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /ua ./cmd/ua/main.go -FROM alpine:3.13.5 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata @@ -31,4 +32,4 @@ WORKDIR /app COPY --from=build /ua . -ENTRYPOINT ["/app/ua"] \ No newline at end of file +ENTRYPOINT ["/app/ua"] diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile index 4cbb44a998..3862d722bd 100644 --- a/docker/user.Dockerfile +++ b/docker/user.Dockerfile @@ -17,13 +17,14 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /user ./cmd/user/main.go -FROM alpine/git:v2.36.3 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ - apk add tzdata && \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo Asia/Shanghai > /etc/timezone && \ +RUN set -eux; \ + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ + apk add --no-cache ca-certificates tzdata; \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ + echo Asia/Shanghai > /etc/timezone; \ apk del tzdata WORKDIR /app From 22101483a9d900918d5df0d1e982597d6f350b39 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Mon, 15 Jun 2026 17:43:51 +0800 Subject: [PATCH 2/4] fix: restore commit Signed-off-by: YuTang Song <2313186065@qq.com> --- docker/aslan.Dockerfile | 27 +++++++++++++++------------ docker/cron.Dockerfile | 11 +++++------ docker/executor.Dockerfile | 11 +++++------ docker/hub-agent.Dockerfile | 11 +++++------ docker/hub-server.Dockerfile | 11 +++++------ docker/init.Dockerfile | 11 +++++------ docker/ua.Dockerfile | 13 ++++++------- docker/user.Dockerfile | 11 +++++------ 8 files changed, 51 insertions(+), 55 deletions(-) diff --git a/docker/aslan.Dockerfile b/docker/aslan.Dockerfile index 16b19e3d8f..4b0e831b00 100644 --- a/docker/aslan.Dockerfile +++ b/docker/aslan.Dockerfile @@ -17,22 +17,25 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /aslan ./cmd/aslan/main.go -FROM alpine:3.20 +FROM alpine/git:v2.36.3 ENV VERSION=1.4.0 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates; \ - apk add --no-cache --virtual .fetch-deps curl tar tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ - curl -fsSL "https://resources.koderover.com/helm-acr_0.8.2_linux_amd64.tar.gz" -o /tmp/helm-acr.tar.gz; \ - mkdir -p /app/.helm/helmplugin/helm-acr; \ - tar -xzf /tmp/helm-acr.tar.gz -C /app/.helm/helmplugin/helm-acr; \ - rm -f /tmp/helm-acr.tar.gz; \ - apk del .fetch-deps +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ + apk del tzdata + +RUN apk update +RUN apk --no-cache add curl curl-dev + +# install ali-acr plugin +RUN curl -fsSL "https://resources.koderover.com/helm-acr_0.8.2_linux_amd64.tar.gz" -o helm-acr.tar.gz &&\ + mkdir -p /app/.helm/helmplugin/helm-acr &&\ + tar -xvzf helm-acr.tar.gz -C /app/.helm/helmplugin/helm-acr &&\ + rm -rf helm-acr* WORKDIR /app diff --git a/docker/cron.Dockerfile b/docker/cron.Dockerfile index 772e21b7c6..aba614fd4d 100644 --- a/docker/cron.Dockerfile +++ b/docker/cron.Dockerfile @@ -17,14 +17,13 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /cron ./cmd/cron/main.go -FROM alpine:3.20 +FROM alpine/git:v2.30.2 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata WORKDIR /app diff --git a/docker/executor.Dockerfile b/docker/executor.Dockerfile index 7e06d0b7fa..203e14bcd2 100644 --- a/docker/executor.Dockerfile +++ b/docker/executor.Dockerfile @@ -19,16 +19,15 @@ RUN --mount=type=cache,id=gobuild,target=/gocache \ RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /jobexecutor ./cmd/jobexecutor/main.go -FROM alpine:3.20 +FROM alpine:3.18.0 WORKDIR /app # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata COPY --from=build /reaper . diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile index dc0f259f34..97f05cd068 100644 --- a/docker/hub-agent.Dockerfile +++ b/docker/hub-agent.Dockerfile @@ -17,14 +17,13 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /hub-agent ./cmd/hub-agent/main.go -FROM alpine:3.20 +FROM alpine/git:v2.30.2 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata WORKDIR /app diff --git a/docker/hub-server.Dockerfile b/docker/hub-server.Dockerfile index 6ce34119e7..6866d0511b 100644 --- a/docker/hub-server.Dockerfile +++ b/docker/hub-server.Dockerfile @@ -17,14 +17,13 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /hub-server ./cmd/hub-server/main.go -FROM alpine:3.20 +FROM alpine:3.13.5 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata WORKDIR /app diff --git a/docker/init.Dockerfile b/docker/init.Dockerfile index 34d22613d1..1a8c0f9123 100644 --- a/docker/init.Dockerfile +++ b/docker/init.Dockerfile @@ -17,14 +17,13 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /init ./cmd/init/main.go -FROM alpine:3.20 +FROM alpine:3.13.5 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata WORKDIR /app diff --git a/docker/ua.Dockerfile b/docker/ua.Dockerfile index 25a603b1c0..dd5b7df31f 100644 --- a/docker/ua.Dockerfile +++ b/docker/ua.Dockerfile @@ -17,14 +17,13 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /ua ./cmd/ua/main.go -FROM alpine:3.20 +FROM alpine:3.13.5 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata @@ -32,4 +31,4 @@ WORKDIR /app COPY --from=build /ua . -ENTRYPOINT ["/app/ua"] +ENTRYPOINT ["/app/ua"] \ No newline at end of file diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile index 3862d722bd..4cbb44a998 100644 --- a/docker/user.Dockerfile +++ b/docker/user.Dockerfile @@ -17,14 +17,13 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /user ./cmd/user/main.go -FROM alpine:3.20 +FROM alpine/git:v2.36.3 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone -RUN set -eux; \ - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \ - apk add --no-cache ca-certificates tzdata; \ - cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ - echo Asia/Shanghai > /etc/timezone; \ +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ + apk add tzdata && \ + cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo Asia/Shanghai > /etc/timezone && \ apk del tzdata WORKDIR /app From 480fb577f4dc652f13d7f1fdebf5af4586ce00e1 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Mon, 15 Jun 2026 18:43:33 +0800 Subject: [PATCH 3/4] fix: change base image for zadig backend dockerfile Signed-off-by: YuTang Song <2313186065@qq.com> --- docker/aslan.Dockerfile | 2 +- docker/cron.Dockerfile | 2 +- docker/executor.Dockerfile | 2 +- docker/hub-agent.Dockerfile | 2 +- docker/hub-server.Dockerfile | 2 +- docker/init.Dockerfile | 2 +- docker/ua.Dockerfile | 4 ++-- docker/user.Dockerfile | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/aslan.Dockerfile b/docker/aslan.Dockerfile index 4b0e831b00..e0271e0dde 100644 --- a/docker/aslan.Dockerfile +++ b/docker/aslan.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /aslan ./cmd/aslan/main.go -FROM alpine/git:v2.36.3 +FROM alpine/git:v2.54.0 ENV VERSION=1.4.0 diff --git a/docker/cron.Dockerfile b/docker/cron.Dockerfile index aba614fd4d..88fa8416bb 100644 --- a/docker/cron.Dockerfile +++ b/docker/cron.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /cron ./cmd/cron/main.go -FROM alpine/git:v2.30.2 +FROM alpine/git:v2.54.0 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ diff --git a/docker/executor.Dockerfile b/docker/executor.Dockerfile index 203e14bcd2..66788cd253 100644 --- a/docker/executor.Dockerfile +++ b/docker/executor.Dockerfile @@ -19,7 +19,7 @@ RUN --mount=type=cache,id=gobuild,target=/gocache \ RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /jobexecutor ./cmd/jobexecutor/main.go -FROM alpine:3.18.0 +FROM alpine:3.20 WORKDIR /app diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile index 97f05cd068..afb4340061 100644 --- a/docker/hub-agent.Dockerfile +++ b/docker/hub-agent.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /hub-agent ./cmd/hub-agent/main.go -FROM alpine/git:v2.30.2 +FROM alpine/git:v2.54.0 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ diff --git a/docker/hub-server.Dockerfile b/docker/hub-server.Dockerfile index 6866d0511b..0997696d83 100644 --- a/docker/hub-server.Dockerfile +++ b/docker/hub-server.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /hub-server ./cmd/hub-server/main.go -FROM alpine:3.13.5 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ diff --git a/docker/init.Dockerfile b/docker/init.Dockerfile index 1a8c0f9123..1d4c2920bf 100644 --- a/docker/init.Dockerfile +++ b/docker/init.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /init ./cmd/init/main.go -FROM alpine:3.13.5 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ diff --git a/docker/ua.Dockerfile b/docker/ua.Dockerfile index dd5b7df31f..f0d713a473 100644 --- a/docker/ua.Dockerfile +++ b/docker/ua.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /ua ./cmd/ua/main.go -FROM alpine:3.13.5 +FROM alpine:3.20 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ @@ -31,4 +31,4 @@ WORKDIR /app COPY --from=build /ua . -ENTRYPOINT ["/app/ua"] \ No newline at end of file +ENTRYPOINT ["/app/ua"] diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile index 4cbb44a998..92baacaa99 100644 --- a/docker/user.Dockerfile +++ b/docker/user.Dockerfile @@ -17,7 +17,7 @@ RUN go mod download RUN --mount=type=cache,id=gobuild,target=/gocache \ go build -v -o /user ./cmd/user/main.go -FROM alpine/git:v2.36.3 +FROM alpine/git:v2.54.0 # https://wiki.alpinelinux.org/wiki/Setting_the_timezone RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ From 8abde245725df9f59a5392c2799f4fd745e13e9e Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Tue, 16 Jun 2026 13:29:05 +0800 Subject: [PATCH 4/4] fix: fix bugs in the zadig dockerfile Signed-off-by: YuTang Song <2313186065@qq.com> --- docker/cron.Dockerfile | 3 +++ docker/hub-agent.Dockerfile | 3 +++ docker/user.Dockerfile | 3 +++ 3 files changed, 9 insertions(+) diff --git a/docker/cron.Dockerfile b/docker/cron.Dockerfile index 88fa8416bb..d3b7801d78 100644 --- a/docker/cron.Dockerfile +++ b/docker/cron.Dockerfile @@ -26,6 +26,9 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories echo Asia/Shanghai > /etc/timezone && \ apk del tzdata +RUN apk update +RUN apk --no-cache add curl curl-dev + WORKDIR /app COPY --from=build /cron . diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile index afb4340061..a4d165ad09 100644 --- a/docker/hub-agent.Dockerfile +++ b/docker/hub-agent.Dockerfile @@ -26,6 +26,9 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories echo Asia/Shanghai > /etc/timezone && \ apk del tzdata +RUN apk update +RUN apk --no-cache add curl curl-dev + WORKDIR /app COPY --from=build /hub-agent . diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile index 92baacaa99..61415a1fb6 100644 --- a/docker/user.Dockerfile +++ b/docker/user.Dockerfile @@ -26,6 +26,9 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories echo Asia/Shanghai > /etc/timezone && \ apk del tzdata +RUN apk update +RUN apk --no-cache add curl curl-dev + WORKDIR /app COPY --from=build /user .