Merge remote-tracking branch 'origin/master' into dev

2023-08-13 15:19:33 +08:00 · 2023-08-13 15:19:33 +08:00 · 1d282b1095
commit 1d282b1095
parent 0d000223a2 ebc1da0972
1 changed files with 4 additions and 4 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -14,11 +14,11 @@ steps:
    image: appleboy/drone-ssh
    settings:
      host:
-        from_secret: bookmarkHost
-      port: 22000
+        from_secret: devHost
+      port: 22
      user: root
      key:
        from_secret: privateSsh
-      timeout: 3m
+      command_timeout: 30m
      script:
-        - cd /root/workspace/bookmark && git pull && docker-compose stop front backend && bash build.sh && docker-compose up -d && docker-compose restart front backend
+        - cd /root/bookmark && git pull && bash build.sh && bash syncFile.sh