HI-VPN/ppanel-web
4
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix(docker): 修正Dockerfile中的用户创建命令和CI分支条件
CI / build (20.15.1) (push) Failing after 15m20s
Details

Browse Source 
修复Dockerfile中使用addgroup/adduser命令导致的兼容性问题，改用groupadd/useradd
修正CI配置中分支条件判断错误，将dev改为develop
This commit is contained in:
shanshanzhong
2026-01-03 20:10:53 -08:00
parent 43c909d1f2
commit c381a2b2ba
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/docker.yml
+4 -4
View File
@@ -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:
docker/ppanel-admin-web/Dockerfile
+2 -2
View File
@@ -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
docker/ppanel-user-web/Dockerfile
+2 -2
View File
@@ -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 ./