From 6fddc51cbfc2dd8ea52b3a64807806e66ebff291 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:12:22 +0100 Subject: [PATCH 01/25] Update '.drone.yml' From 47270cca2aa15842c13724378b3f1875c22381de Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:13:34 +0100 Subject: [PATCH 02/25] Update '.drone.yml' --- .drone.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 327ba49d..5ef7f189 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,11 +5,10 @@ steps: - name: build image: plugins/hugo settings: - hugo_version: 0.55 - pull: always - url: https://jk.nipponalba.scot - validate: true - + image: cbrgm/drone-hugo:latest + validate: true + url: https://jk.nipponalba.scot + - name: deploy image: appleboy/drone-scp settings: From 5614a68859dad38f98b2a606fe075118870e0462 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:14:58 +0100 Subject: [PATCH 03/25] Update '.drone.yml' --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5ef7f189..c30db995 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,9 +5,10 @@ steps: - name: build image: plugins/hugo settings: - image: cbrgm/drone-hugo:latest - validate: true + hugo_version: 0.55 + pull: always url: https://jk.nipponalba.scot + validate: true - name: deploy image: appleboy/drone-scp From bdeec1924fddb7e31f909db36e31a3f541bd36aa Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:21:11 +0100 Subject: [PATCH 04/25] Update '.drone.yml' --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c30db995..9e7e007e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,6 @@ kind: pipeline -name: default +name: hugo-build-push +type: ssh steps: - name: build @@ -8,7 +9,7 @@ steps: hugo_version: 0.55 pull: always url: https://jk.nipponalba.scot - validate: true + validate: false - name: deploy image: appleboy/drone-scp From 1b16628f4359ef17ae8a44220476f6b9ef1a03fe Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:21:59 +0100 Subject: [PATCH 05/25] Update '.drone.yml' --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9e7e007e..2881abdd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,5 @@ kind: pipeline -name: hugo-build-push -type: ssh + steps: - name: build From ff6b78bf56bbd13c30694d4143c9cdcd914a69a0 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:25:15 +0100 Subject: [PATCH 06/25] Update '.drone.yml' --- .drone.yml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2881abdd..eead9729 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,26 +1,14 @@ -kind: pipeline - - -steps: -- name: build - image: plugins/hugo - settings: - hugo_version: 0.55 - pull: always +pipeline: + build: + image: cbrgm/drone-hugo:latest + validate: true url: https://jk.nipponalba.scot - validate: false - -- name: deploy - image: appleboy/drone-scp - settings: + + deploy: + image: appleboy/drone-scp host: 192.168.1.33 port: 9439 username: jk target: /var/www/nipponalba/jk source: public/* - when: - branch: - - master - event: - exclude: - - pull_request \ No newline at end of file + secrets: [ ssh_key ] \ No newline at end of file From 1b661ddf9de8740d16e28996bbf2ef40672b5b71 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:29:02 +0100 Subject: [PATCH 07/25] Update '.drone.yml' --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index eead9729..2a7ad309 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,8 @@ pipeline: image: appleboy/drone-scp host: 192.168.1.33 port: 9439 - username: jk + user: jk target: /var/www/nipponalba/jk source: public/* - secrets: [ ssh_key ] \ No newline at end of file + key: from_secret: ssh_key + passphrase: from_secret: ssh_pass \ No newline at end of file From 1cbee8e81836db10045067af01614d42e8e3071a Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:29:43 +0100 Subject: [PATCH 08/25] Update '.drone.yml' --- .drone.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2a7ad309..bf67d5b1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,5 +11,7 @@ pipeline: user: jk target: /var/www/nipponalba/jk source: public/* - key: from_secret: ssh_key - passphrase: from_secret: ssh_pass \ No newline at end of file + key: + from_secret: ssh_key + passphrase: + from_secret: ssh_pass \ No newline at end of file From 3fab71250f94e345d059988ddef246fafa3bb43e Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:43:26 +0100 Subject: [PATCH 09/25] Update '.drone.yml' --- .drone.yml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index bf67d5b1..253c9a02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,17 +1,30 @@ -pipeline: - build: - image: cbrgm/drone-hugo:latest - validate: true +kind: pipeline +name: default + +steps: +- name: build + image: plugins/hugo + settings: + hugo_version: 0.55 + pull: always url: https://jk.nipponalba.scot + validate: true - deploy: - image: appleboy/drone-scp +- name: deploy + image: appleboy/drone-scp + settings: host: 192.168.1.33 - port: 9439 - user: jk target: /var/www/nipponalba/jk source: public/* + username: jk key: from_secret: ssh_key passphrase: - from_secret: ssh_pass \ No newline at end of file + from_secret: ssh_pass + port: 9439 + when: + branch: + - master + event: + exclude: + - pull_request \ No newline at end of file From 4fbb4bf609a0281c012134f3a88d20830af60664 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:56:25 +0100 Subject: [PATCH 10/25] Update '.drone.yml' --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 253c9a02..a9acbbbf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,5 @@ +--- + kind: pipeline name: default From fcf2b2914d88a9ae76ee1849ab51396f34647b3f Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 15:58:04 +0100 Subject: [PATCH 11/25] Update '.drone.yml' --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index a9acbbbf..f71532ea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,5 @@ ---- - kind: pipeline +type: docker name: default steps: From 4e945cf277ce52b977c9163b7ddeb05e79fbef7e Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:08:40 +0100 Subject: [PATCH 12/25] Update '.drone.yml' --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index f71532ea..f0f6235b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,9 @@ kind: pipeline type: docker name: default +platform: + arch: arm64 + steps: - name: build image: plugins/hugo From 067454296e7ce32df986e3e262fbf678aecdda57 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:15:53 +0100 Subject: [PATCH 13/25] Update '.drone.yml' --- .drone.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index f0f6235b..754ec7af 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,10 +7,8 @@ platform: steps: - name: build - image: plugins/hugo + image: cbrgm/drone-hugo:latest settings: - hugo_version: 0.55 - pull: always url: https://jk.nipponalba.scot validate: true From 54db039184568e762c48c831221d0d55a324a03e Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:17:50 +0100 Subject: [PATCH 14/25] Update '.drone.yml' --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 754ec7af..f6910ae4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,8 +9,9 @@ steps: - name: build image: cbrgm/drone-hugo:latest settings: - url: https://jk.nipponalba.scot validate: true + output: public + url: https://jk.nipponalba.scot - name: deploy image: appleboy/drone-scp From 772d1bb40c1cdb3d0fd33fab84f08bf7a09040f5 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:18:52 +0100 Subject: [PATCH 15/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f6910ae4..bef02b9b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: settings: validate: true output: public - url: https://jk.nipponalba.scot + url: ["https://jk.nipponalba.scot"] - name: deploy image: appleboy/drone-scp From 3a11f675324327682acebf99e2c7a09a9d205f72 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:21:12 +0100 Subject: [PATCH 16/25] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index bef02b9b..bc5f81b6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,7 @@ name: default platform: arch: arm64 + os: linux steps: - name: build From 11175ce50d78c63aef3229fb3651b296e7e27356 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:21:47 +0100 Subject: [PATCH 17/25] Update '.drone.yml' --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bc5f81b6..b8980f9e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,4 @@ kind: pipeline -type: docker name: default platform: From 155051b00dbbfef39296e6d20d08ae83b446f231 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:23:27 +0100 Subject: [PATCH 18/25] Update '.drone.yml' --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index b8980f9e..985cd4bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,9 @@ platform: steps: - name: build image: cbrgm/drone-hugo:latest + platform: + arch: arm64 + os: linux settings: validate: true output: public From cda8937223d11705b4a2a2c8c021636231e92b31 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:35:58 +0100 Subject: [PATCH 19/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 985cd4bc..3af32df7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo:latest + image: cbrgm/drone-hugo_arm64:latest platform: arch: arm64 os: linux From ff7c4b97ffbfb49987bb49ae3150892736639e94 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:36:35 +0100 Subject: [PATCH 20/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3af32df7..a10edd10 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo_arm64:latest + image: cbrgm/drone-hugo_aarch64:latest platform: arch: arm64 os: linux From ba7798017f4ab8e8ea2fea42ae711d9e3ec7329d Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:37:08 +0100 Subject: [PATCH 21/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a10edd10..adebce97 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo_aarch64:latest + image: cbrgm/drone-hugo-aarch64 platform: arch: arm64 os: linux From 1d917caa807af3e2a80b3b781764269628f5ffec Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:37:29 +0100 Subject: [PATCH 22/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index adebce97..e60f4786 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo-aarch64 + image: cbrgm/drone-hugo-arm64 platform: arch: arm64 os: linux From 68c4a69c8d53317479970108317a066ebc84d321 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:42:24 +0100 Subject: [PATCH 23/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e60f4786..985cd4bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo-arm64 + image: cbrgm/drone-hugo:latest platform: arch: arm64 os: linux From f4b474fcc57730131961bc7f44b2178d05868b63 Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:44:21 +0100 Subject: [PATCH 24/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 985cd4bc..89b99d68 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo:latest + image: cbrgm/drone-hugo:linux-arm64 platform: arch: arm64 os: linux From c48304f982bf471364b47c835496b1264631cb8d Mon Sep 17 00:00:00 2001 From: jk Date: Wed, 29 Apr 2020 16:45:00 +0100 Subject: [PATCH 25/25] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 89b99d68..7bc0251b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: steps: - name: build - image: cbrgm/drone-hugo:linux-arm64 + image: plugins/hugo:linux-arm64 platform: arch: arm64 os: linux