Compare commits

...

8 Commits

Author SHA1 Message Date
liubocheng e498f71b90 dev:修改测试
Deploy to Test / deploy (push) Has been cancelled Details
2025-03-31 23:46:33 +08:00
liubocheng ae943d4dad dev:测试 2025-03-31 21:42:40 +08:00
liubocheng 1809a122f1 dev:修改测试 2025-03-31 11:01:13 +08:00
liubocheng 6331f97e90 dev:删除版本 2025-03-29 11:45:37 +08:00
liubocheng 6b6966b295 dev:修改dockerfile 2025-03-29 08:55:47 +08:00
liubocheng 0065edf845 dev:测试变量 2025-03-28 21:26:38 +08:00
liubocheng 9624ca7e2e dev:修改输出 2025-03-28 21:21:19 +08:00
liubocheng f0ef5a7d2b dev:测试变量 2025-03-28 20:45:19 +08:00
3 changed files with 11 additions and 12 deletions

View File

@ -33,7 +33,7 @@ jobs:
- name: Configure SSH - name: Configure SSH
env: env:
SSH_PRIVATE_KEY: ${{ secrets.TEST_SSH_KEY }} SSH_PRIVATE_KEY: ${{ secrets.COMMON_USER_RSA }}
run: | run: |
SSH_DIR="/root/.ssh" SSH_DIR="/root/.ssh"
mkdir -p $SSH_DIR mkdir -p $SSH_DIR
@ -42,21 +42,21 @@ jobs:
echo "$SSH_PRIVATE_KEY" echo "$SSH_PRIVATE_KEY"
chmod 700 $SSH_DIR chmod 700 $SSH_DIR
chmod 600 $SSH_DIR/id_rsa 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 - name: Sync code
run: | run: |
rsync -avz --delete --exclude=".env" \ rsync -avz --delete --exclude=".env" \
-e "ssh -o StrictHostKeyChecking=no -i /root/.ssh/id_rsa" \ -e "ssh -o StrictHostKeyChecking=no -i /root/.ssh/id_rsa" \
--rsync-path="mkdir -p /data/laravel_test && rsync" \ --rsync-path="mkdir -p /home/common-user/demo/test_runner && rsync" \
./ deploy-user@43.142.97.39:/data/laravel_test/ ./ common-user@192.168.110.108:/home/common-user/demo/test_runner
- name: Deploy containers - name: Deploy containers
run: | run: |
ssh -i /root/.ssh/id_rsa deploy-user@43.142.97.39 /bin/bash << 'EOF' ssh -i /root/.ssh/id_rsa common-user@192.168.110.108 /bin/bash << 'EOF'
COMPOSE_PROJECT="laravel_test" COMPOSE_PROJECT="test_runner"
echo "DEBUG - COMPOSE_PROJECT=${COMPOSE_PROJECT}" # 确认变量值 echo "DEBUG - COMPOSE_PROJECT=${COMPOSE_PROJECT}" # 确认变量值
cd /data/laravel_test cd /home/common-user/demo/test_runner
# 使用docker-compose插件模式 # 使用docker-compose插件模式
/usr/bin/docker compose -p "${COMPOSE_PROJECT}" down --volumes || true /usr/bin/docker compose -p "${COMPOSE_PROJECT}" down --volumes || true

View File

@ -1,9 +1,8 @@
version: '3.8'
services: services:
php: php:
build: . # 指向 Dockerfile 目录 build: . # 指向 Dockerfile 目录
volumes: volumes:
- /data/laravel_test:/var/www/html - /home/common-user/demo/test_runner:/var/www/html
working_dir: /var/www/html working_dir: /var/www/html
networks: networks:
- laravel_net - laravel_net
@ -20,7 +19,7 @@ services:
ports: ports:
- "80:80" - "80:80"
volumes: volumes:
- /data/laravel_test:/var/www/html - /home/common-user/demo/test_runner:/var/www/html
- ./nginx.conf:/etc/nginx/conf.d/default.conf - ./nginx.conf:/etc/nginx/conf.d/default.conf
networks: networks:
- laravel_net - laravel_net

View File

@ -16,8 +16,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
--filename=composer --filename=composer
# 创建非 root 用户(推荐与宿主机用户 UID/GID 一致) # 创建非 root 用户(推荐与宿主机用户 UID/GID 一致)
ARG USER_ID=1003 # 宿主机 deploy-user 的 UID ARG USER_ID=1001 # 宿主机 common-user 的 UID
ARG GROUP_ID=1003 # 宿主机 deploy-user 的 GID ARG GROUP_ID=1001 # 宿主机 common-user 的 GID
RUN groupadd -g ${GROUP_ID} appuser \ RUN groupadd -g ${GROUP_ID} appuser \
&& useradd -u ${USER_ID} -g appuser -m -d /home/appuser -s /bin/bash appuser && useradd -u ${USER_ID} -g appuser -m -d /home/appuser -s /bin/bash appuser