From c7ff82108ed77a2510ebac6f6c92c81cfb70268c Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 14:25:31 +0800 Subject: [PATCH 01/16] temp --- .drone.yml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 93c58e0..3807b8e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,18 +8,17 @@ clone: steps: - name: pull image: bitnami/git -# volumes: -# - name: app -# path: /app -# - name: ssh -# path: ~/.ssh + volumes: + - name: app + path: /app + - name: ssh + path: ~/.ssh commands: - - pwd - - ls -l ./ -# - cd /app/blogPublish -# - git pull -# - cd /app/blogPublish/source/_posts/technology-note -# - git pull + - cd /app/BlogGenerate + - git pull + - cd /app/blogPublish/source/_posts/technology-note + - git pull + - ls # - name: package # image: node:16-bullseye # volumes: @@ -42,4 +41,11 @@ steps: # include: [ "app.jar", "app.jar.md5" ] # script: # - cd ~/packages -# - md5sum -c app.jar.md5 \ No newline at end of file +# - md5sum -c app.jar.md5 +volumes: # 定义流水线挂载目录，用于共享数据 + - name: app + host: + path: /dataPool/systemData/linux_env/data/drone/workspace/blogPublish + - name: ssh + host: + path: /dataPool/systemData/linux_env/data/drone/ssh -- 2.47.2 From 9f58d938e425f25de4ae27766e394a3553ae30a6 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 14:54:44 +0800 Subject: [PATCH 02/16] temp --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3807b8e..8583192 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,8 +12,9 @@ steps: - name: app path: /app - name: ssh - path: ~/.ssh + path: /app/ssh commands: + - ssh-add /app/ssh/id_rsa - cd /app/BlogGenerate - git pull - cd /app/blogPublish/source/_posts/technology-note -- 2.47.2 From 35982442a575c473e1e1465c74a22dfc9a6cd139 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 14:55:52 +0800 Subject: [PATCH 03/16] temp --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 8583192..78c64ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,8 +14,10 @@ steps: - name: ssh path: /app/ssh commands: + - ls -l /app/ssh - ssh-add /app/ssh/id_rsa - cd /app/BlogGenerate + - ls -l - git pull - cd /app/blogPublish/source/_posts/technology-note - git pull -- 2.47.2 From be47579f6ef8e2a88c1fe4a197f9cbc77491f778 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 14:57:15 +0800 Subject: [PATCH 04/16] temp --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 78c64ff..7c702e7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,7 @@ steps: - name: ssh path: /app/ssh commands: + - ls -l /app - ls -l /app/ssh - ssh-add /app/ssh/id_rsa - cd /app/BlogGenerate -- 2.47.2 From 59a9c32448fe10dc8ace12e3c10b17a31ffcde2e Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:04:34 +0800 Subject: [PATCH 05/16] temp --- .drone.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7c702e7..7f1a452 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,15 +8,13 @@ clone: steps: - name: pull image: bitnami/git - volumes: - - name: app - path: /app - - name: ssh - path: /app/ssh + settings: + privateKey: + from_secret: privateSsh commands: - - ls -l /app - - ls -l /app/ssh - - ssh-add /app/ssh/id_rsa + - echo $privateKey + - echo $privateKey>sshKey + - ssh-add sshKey - cd /app/BlogGenerate - ls -l - git pull @@ -45,11 +43,4 @@ steps: # include: [ "app.jar", "app.jar.md5" ] # script: # - cd ~/packages -# - md5sum -c app.jar.md5 -volumes: # 定义流水线挂载目录，用于共享数据 - - name: app - host: - path: /dataPool/systemData/linux_env/data/drone/workspace/blogPublish - - name: ssh - host: - path: /dataPool/systemData/linux_env/data/drone/ssh +# - md5sum -c app.jar.md5 \ No newline at end of file -- 2.47.2 From 1266d75657df2d58532eaf5e423a999f5c0c4223 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:10:11 +0800 Subject: [PATCH 06/16] temp --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7f1a452..c7c337c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ clone: steps: - name: pull image: bitnami/git - settings: + environment: privateKey: from_secret: privateSsh commands: -- 2.47.2 From e1311e1b7661e0c11d482750e35ffbdc62ddcee7 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:11:33 +0800 Subject: [PATCH 07/16] temp --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c7c337c..9db8e90 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,8 @@ steps: from_secret: privateSsh commands: - echo $privateKey - - echo $privateKey>sshKey + - echo $privateKey > sshKey + - cat sshKey - ssh-add sshKey - cd /app/BlogGenerate - ls -l -- 2.47.2 From 5d5a1924ff6d5bd91da83088b68e42bc13651442 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:11:45 +0800 Subject: [PATCH 08/16] temp --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 9db8e90..f7c6c0d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,7 @@ steps: commands: - echo $privateKey - echo $privateKey > sshKey + - sleep 40 - cat sshKey - ssh-add sshKey - cd /app/BlogGenerate -- 2.47.2 From e0a97e9b7e89b7a6beb46bdcfe7211672b1dbb48 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:19:26 +0800 Subject: [PATCH 09/16] temp --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f7c6c0d..011812b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,9 +14,10 @@ steps: commands: - echo $privateKey - echo $privateKey > sshKey - - sleep 40 + - eval $(ssh-agent) - cat sshKey - ssh-add sshKey + - sleep 100 - cd /app/BlogGenerate - ls -l - git pull -- 2.47.2 From 3a43d5d122e5d811de9553780a485a22bf2a3369 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:21:19 +0800 Subject: [PATCH 10/16] temp --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 011812b..f6f5ee5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,6 +16,7 @@ steps: - echo $privateKey > sshKey - eval $(ssh-agent) - cat sshKey + - chmod 600 sshKey - ssh-add sshKey - sleep 100 - cd /app/BlogGenerate -- 2.47.2 From 8d2429044ccdd0765daf1134e6b38a325e710612 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:22:22 +0800 Subject: [PATCH 11/16] temp --- .drone.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index f6f5ee5..3117fb4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,12 +19,8 @@ steps: - chmod 600 sshKey - ssh-add sshKey - sleep 100 - - cd /app/BlogGenerate + - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git - ls -l - - git pull - - cd /app/blogPublish/source/_posts/technology-note - - git pull - - ls # - name: package # image: node:16-bullseye # volumes: -- 2.47.2 From 47c51d0671b8e3792173c4cfbc4de81654fcfd15 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:31:03 +0800 Subject: [PATCH 12/16] temp --- .drone.yml | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3117fb4..eaacf61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,21 +8,25 @@ clone: steps: - name: pull image: bitnami/git + volumes: + - name: ssh + path: /app/.ssh + commands: + - cd /app/.ssh + - eval $(ssh-agent) + - ssh-add id_rsa + - cd ../ + - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git + - cd BlogGenerate/source/_posts + - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/technology-note.git + - sleep 100 + - ls -l + # - name: package + # image: node:16-bullseye + environment: privateKey: from_secret: privateSsh - commands: - - echo $privateKey - - echo $privateKey > sshKey - - eval $(ssh-agent) - - cat sshKey - - chmod 600 sshKey - - ssh-add sshKey - - sleep 100 - - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git - - ls -l -# - name: package -# image: node:16-bullseye # volumes: # - name: app # path: /app @@ -43,4 +47,11 @@ steps: # include: [ "app.jar", "app.jar.md5" ] # script: # - cd ~/packages -# - md5sum -c app.jar.md5 \ No newline at end of file +# - md5sum -c app.jar.md5 +volumes: + - name: ssh + host: + path: /root/.ssh + - name: npmRep + host: + path: /root/npmRep \ No newline at end of file -- 2.47.2 From e262980f7c536707321fb170b34feb34760095a9 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:36:40 +0800 Subject: [PATCH 13/16] temp --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index eaacf61..c751c1d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,6 +16,7 @@ steps: - eval $(ssh-agent) - ssh-add id_rsa - cd ../ + - ssh ssh-keyscan -p 222 -t rsa gitea.fleyx.com >> ~/.ssh/known_hosts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git - cd BlogGenerate/source/_posts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/technology-note.git -- 2.47.2 From 1bacfafd67216dd131c45ca22a92d3a652509f08 Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:37:38 +0800 Subject: [PATCH 14/16] temp --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c751c1d..bf1e7be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - eval $(ssh-agent) - ssh-add id_rsa - cd ../ - - ssh ssh-keyscan -p 222 -t rsa gitea.fleyx.com >> ~/.ssh/known_hosts + - mkdir ~/.ssh && ssh ssh-keyscan -p 222 -t rsa gitea.fleyx.com >> ~/.ssh/known_hosts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git - cd BlogGenerate/source/_posts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/technology-note.git -- 2.47.2 From 41c4a6717d6d5e4c84c06795621e46d186c50c6b Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:39:12 +0800 Subject: [PATCH 15/16] temp --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bf1e7be..ef0e697 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - eval $(ssh-agent) - ssh-add id_rsa - cd ../ - - mkdir ~/.ssh && ssh ssh-keyscan -p 222 -t rsa gitea.fleyx.com >> ~/.ssh/known_hosts + - mkdir ~/.ssh && ssh-keyscan -p 222 -t rsa gitea.fleyx.com >> ~/.ssh/known_hosts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git - cd BlogGenerate/source/_posts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/technology-note.git -- 2.47.2 From a6a62f71f8351dd3e2297933d2446b2b651e19fc Mon Sep 17 00:00:00 2001 From: fanxb Date: Sat, 24 Sep 2022 15:40:42 +0800 Subject: [PATCH 16/16] temp --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index ef0e697..52ef1c2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,7 @@ steps: - ssh-add id_rsa - cd ../ - mkdir ~/.ssh && ssh-keyscan -p 222 -t rsa gitea.fleyx.com >> ~/.ssh/known_hosts + - sleep 2001 - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/BlogGenerate.git - cd BlogGenerate/source/_posts - git clone --depth 1 ssh://git@gitea.fleyx.com:222/fanxb/technology-note.git -- 2.47.2