From ecc2f51722edf0cabcdb0e91727c3fbf4f7008ac Mon Sep 17 00:00:00 2001
From: liubocheng <22913113@qq.com>
Date: Fri, 4 Apr 2025 22:07:29 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E5=8F=82=E6=95=B0=E4=BB=8Edocker-compose?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=88=B0dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 8 ++++++--
 dockerfile         | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9784e41..17f0fe3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,11 @@
-version: '3.8'
+version: '3.8'
 services:
   php:
-    build: .  # 指向 Dockerfile 目录
+    build:
+      context: .
+      args:
+        USER_ID: "1003"
+        GROUP_ID: "1003"	
     volumes:
       - /data/laravel_test:/var/www/html
     working_dir: /var/www/html
diff --git a/dockerfile b/dockerfile
index cdce13c..0de9e2a 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,4 +1,6 @@
-FROM php:7.3-fpm
+FROM php:7.3-fpm
+ARG USER_ID
+ARG GROUP_ID
 
 # 替换为清华大学镜像源（Debian 10 Buster）
 RUN sed -i 's/deb.debian.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list \
@@ -16,8 +18,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
     --filename=composer
 
 # 创建非 root 用户（推荐与宿主机用户 UID/GID 一致）
-ARG USER_ID=1003  # 宿主机 deploy-user 的 UID
-ARG GROUP_ID=1003 # 宿主机 deploy-user 的 GID
 RUN groupadd -g ${GROUP_ID} appuser \
     && useradd -u ${USER_ID} -g appuser -m -d /home/appuser -s /bin/bash appuser