gitlab-ci部署

.gitlab-ci.yml

@@ -51,6 +51,6 @@ deploy:
 #    - cd /var/www/bswas_test && sudo git config --global credential.helper store
 #    - sudo git pull
     - sudo bash ci/scpUpdate.sh
-    - sudo bash ci/executeCommand.sh
+#    - sudo bash ci/executeCommand.sh
   only:
     - master

ci/executeCommand.sh

@@ -1,24 +1,25 @@
 #!/bin/bash
 
-
+Ip="was.baoshi56.com"
+username="baoshi"
+password="bAOSHI123!"
+dsc=/var/www/was
 update_path=/var/www/update
 #重启队列
 #sudo bash runServes.sh
 
-
-
 # shellcheck disable=SC2045
 # shellcheck disable=SC2006
 for file in `ls $update_path`
      do
         if [ "composer.json" == "$file" ]; then
-            sudo composer install
+            sshpass -p $password ssh -p 10022 $username@$Ip "cd $dsc; sudo composer install"
         elif [ "package.json" == "$file" ]; then
-            sudo yarn install
+            sshpass -p $password ssh -p 10022 $username@$Ip "cd $dsc; sudo yarn install"
         elif [ "resources" == "$file" ]; then
-            sudo yarn run development
+            sshpass -p $password ssh -p 10022 $username@$Ip "cd $dsc; sudo yarn run development"
         elif [ "database" == "$file" ]; then
-            sudo php artisan migrate
+             sshpass -p $password ssh -p 10022 $username@$Ip "cd $dsc; sudo php artisan migrate"
         fi
     done
 

ci/scpUpdate.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 Ip="was.baoshi56.com"
-username="ci"
-password="q22w33e"
+username="baoshi"
+password="bAOSHI123!"
 update_path=/var/www/update
 dsc=/var/www/was
 
@@ -19,4 +19,6 @@ expect {
 expect eof"
 done
 
+sudo chmod 775 $update_path/* -R
+