From 78a70436a32653a4f891b2da98f306d78844eeaf Mon Sep 17 00:00:00 2001
From: XieHaoLiang <806854015@qq.com>
Date: Fri, 27 Dec 2024 10:13:00 +0800
Subject: [PATCH] fix

---
 .gitlab-ci.yml | 8 ++++----
 deploy.sh      | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 deploy.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 746639e..44665c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ update-code-dev:
     GIT_STRATEGY: none
   script:
     - cd ${WEBROOT_PATH}/${PROJECT_DIR} && git pull
-    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} npm install
+    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} php bash deploy.sh
   after_script:
     # 依靠starapt项目的deploy通知
     - cd ${COMPOSE_PATH} && env | docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/starapt php php artisan deploy:notice
@@ -30,7 +30,7 @@ update-code-pre:
     GIT_STRATEGY: none
   script:
     - cd ${WEBROOT_PATH}/${PROJECT_DIR} && git pull
-    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} npm install
+    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} php bash deploy.sh
   after_script:
     # 依靠starapt项目的deploy通知
     - cd ${COMPOSE_PATH} && env | docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/starapt php php artisan deploy:notice
@@ -45,7 +45,7 @@ update-code-xhj:
     GIT_STRATEGY: none
   script:
     - cd ${WEBROOT_PATH}/${PROJECT_DIR} && git pull
-    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} npm install
+    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} php bash deploy.sh
   after_script:
     # 依靠starapt项目的deploy通知
     - cd ${COMPOSE_PATH} && env | docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/starapt php php artisan deploy:notice
@@ -60,7 +60,7 @@ update-code-sky:
     GIT_STRATEGY: none
   script:
     - cd ${WEBROOT_PATH}/${PROJECT_DIR} && git pull
-    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} npm install
+    - cd ${COMPOSE_PATH} && docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/${PROJECT_DIR} php bash deploy.sh
   after_script:
     # 依靠starapt项目的deploy通知
     - cd ${COMPOSE_PATH} && env | docker-compose exec -T -w /webroot/${WEBROOT_PATH##*/}/starapt php php artisan deploy:notice
diff --git a/deploy.sh b/deploy.sh
new file mode 100644
index 0000000..0f35ff4
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -ex
+npm install