From c381a2b2bafda6aa0629b23886d47b88fa8deb91 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Sat, 3 Jan 2026 20:10:53 -0800 Subject: [PATCH] =?UTF-8?q?fix(docker):=20=E4=BF=AE=E6=AD=A3Dockerfile?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=A8=E6=88=B7=E5=88=9B=E5=BB=BA=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=92=8CCI=E5=88=86=E6=94=AF=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复Dockerfile中使用addgroup/adduser命令导致的兼容性问题，改用groupadd/useradd 修正CI配置中分支条件判断错误，将dev改为develop --- .gitea/workflows/docker.yml | 8 ++++---- docker/ppanel-admin-web/Dockerfile | 4 ++-- docker/ppanel-user-web/Dockerfile | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index e55d6cf..330a036 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -21,10 +21,10 @@ env: DOCKER_BUILDKIT: 1 DOCKER_API_VERSION: "1.44" # Host SSH - 根据分支动态选择 - SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'dev' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }} - SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'dev' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }} - SSH_USER: ${{ github.ref_name == 'main' && vars.PRO_SSH_USER || (github.ref_name == 'dev' && vars.DEV_SSH_USER || vars.PRO_SSH_USER) }} - SSH_PASSWORD: ${{ github.ref_name == 'main' && vars.PRO_SSH_PASSWORD || (github.ref_name == 'dev' && vars.DEV_SSH_PASSWORD || vars.PRO_SSH_PASSWORD) }} + SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'develop' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }} + SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'develop' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }} + SSH_USER: ${{ github.ref_name == 'main' && vars.PRO_SSH_USER || (github.ref_name == 'dedevelopv' && vars.DEV_SSH_USER || vars.PRO_SSH_USER) }} + SSH_PASSWORD: ${{ github.ref_name == 'main' && vars.PRO_SSH_PASSWORD || (github.ref_name == 'develop' && vars.DEV_SSH_PASSWORD || vars.PRO_SSH_PASSWORD) }} jobs: build: diff --git a/docker/ppanel-admin-web/Dockerfile b/docker/ppanel-admin-web/Dockerfile index 38cd185..b7eee84 100644 --- a/docker/ppanel-admin-web/Dockerfile +++ b/docker/ppanel-admin-web/Dockerfile @@ -5,8 +5,8 @@ FROM oven/bun:latest AS base WORKDIR /app # Create a non-root user for running the production application -RUN addgroup --system --gid 1001 nodejs \ - && adduser --system --uid 1001 nextjs +RUN groupadd -r -g 1001 nodejs \ + && useradd -r -u 1001 -g nodejs nextjs # Change to non-root user USER nextjs diff --git a/docker/ppanel-user-web/Dockerfile b/docker/ppanel-user-web/Dockerfile index 99cadfd..be70081 100644 --- a/docker/ppanel-user-web/Dockerfile +++ b/docker/ppanel-user-web/Dockerfile @@ -5,8 +5,8 @@ FROM oven/bun:latest AS base WORKDIR /app # Create non-root user and set permissions -RUN addgroup --system --gid 1001 nodejs \ - && adduser --system --uid 1001 nextjs +RUN groupadd -r -g 1001 nodejs \ + && useradd -r -u 1001 -g nodejs nextjs # Copy build output and static files COPY ./apps/user/.next/standalone ./