From 1809a122f134729921fcf10dc18cd531bc3c7f2a Mon Sep 17 00:00:00 2001
From: liubocheng <22913113@qq.com>
Date: Mon, 31 Mar 2025 11:01:13 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/deploy-dev.yml | 18 +++++++-----------
docker-compose.yml | 4 ++--
dockerfile | 4 ++--
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index ed20def..ccc8841 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -33,7 +33,7 @@ jobs:
- name: Configure SSH
env:
- SSH_PRIVATE_KEY: ${{ secrets.TEST_SSH_KEY }}
+ SSH_PRIVATE_KEY: ${{ secrets.COMMON_USER_RSA }}
run: |
SSH_DIR="/root/.ssh"
mkdir -p $SSH_DIR
@@ -42,25 +42,21 @@ jobs:
echo "$SSH_PRIVATE_KEY"
chmod 700 $SSH_DIR
chmod 600 $SSH_DIR/id_rsa
- ssh-keyscan 43.142.97.39 >> $SSH_DIR/known_hosts
+ ssh-keyscan 192.168.110.108 >> $SSH_DIR/known_hosts
- name: Sync code
run: |
rsync -avz --delete --exclude=".env" \
-e "ssh -o StrictHostKeyChecking=no -i /root/.ssh/id_rsa" \
- --rsync-path="mkdir -p /data/laravel_test && rsync" \
- ./ deploy-user@43.142.97.39:/data/laravel_test/
+ --rsync-path="mkdir -p /home/common-user/demo/test_runner && rsync" \
+ ./ common-user@192.168.110.108:/home/common-user/demo/test_runner
- name: Deploy containers
- env:
- HOST_UID: ${{ secrets.HOST_UID }}
run: |
- echo "HOST_UID"
- echo "${HOST_UID}1"
- ssh -i /root/.ssh/id_rsa deploy-user@43.142.97.39 /bin/bash << 'EOF'
- COMPOSE_PROJECT="laravel_test"
+ ssh -i /root/.ssh/id_rsa common-user@192.168.110.108 /bin/bash << 'EOF'
+ COMPOSE_PROJECT="test_runner"
echo "DEBUG - COMPOSE_PROJECT=${COMPOSE_PROJECT}" # 确认变量值
- cd /data/laravel_test
+ cd /home/common-user/demo/test_runner
# 使用docker-compose插件模式
/usr/bin/docker compose -p "${COMPOSE_PROJECT}" down --volumes || true
diff --git a/docker-compose.yml b/docker-compose.yml
index 53f5342..fab09dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
php:
build: . # 指向 Dockerfile 目录
volumes:
- - /data/laravel_test:/var/www/html
+ - /home/common-user/demo/test_runner:/var/www/html
working_dir: /var/www/html
networks:
- laravel_net
@@ -19,7 +19,7 @@ services:
ports:
- "80:80"
volumes:
- - /data/laravel_test:/var/www/html
+ - /home/common-user/demo/test_runner:/var/www/html
- ./nginx.conf:/etc/nginx/conf.d/default.conf
networks:
- laravel_net
diff --git a/dockerfile b/dockerfile
index 4458f1b..33e2335 100644
--- a/dockerfile
+++ b/dockerfile
@@ -16,8 +16,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
--filename=composer
# 创建非 root 用户（推荐与宿主机用户 UID/GID 一致）
-ARG USER_ID=1001 # 宿主机 deploy-user 的 UID
-ARG GROUP_ID=1001 # 宿主机 deploy-user 的 GID
+ARG USER_ID=1001 # 宿主机 common-user 的 UID
+ARG GROUP_ID=1001 # 宿主机 common-user 的 GID
RUN groupadd -g ${GROUP_ID} appuser \
&& useradd -u ${USER_ID} -g appuser -m -d /home/appuser -s /bin/bash appuser