From bc339c1537c1f2731ec115b8a4fd48ceb1f5ee2a Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 28 Jun 2023 11:26:39 +0100 Subject: [PATCH 1/6] Add Drone.yml --- .drone.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..c9bac75 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,21 @@ +-- +kind: pipeline +name: deploy to quarto.washnote.org +type: docker + + +steps: + - name: build quarto site + image: cynkra/quarto-r:1.4.169-4.3.1 + commands: + - quarto render + + - name: deploy to running app instance + image: git.coopcloud.tech/coop-cloud/docker-cp-deploy:latest + settings: + host: washnote.org + service: dev_washnote_com + source: _site + dest: /usr/share/nginx/html/ + deploy_key: + from_secret: drone_ssh_washnote_org From bbc51410b7a9e2afc0720d7c0077f9ff74157247 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 28 Jun 2023 11:28:00 +0100 Subject: [PATCH 2/6] Fix Drone --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c9bac75..1712312 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,8 @@ --- +--- kind: pipeline name: deploy to quarto.washnote.org type: docker - steps: - name: build quarto site image: cynkra/quarto-r:1.4.169-4.3.1 From 85207119b47165733ae272a35bbb0615e7a91ae0 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 28 Jun 2023 11:32:39 +0100 Subject: [PATCH 3/6] Fix drone, again --- .drone.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1712312..f1bce71 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,20 +1,17 @@ --- kind: pipeline name: deploy to quarto.washnote.org -type: docker - steps: - name: build quarto site image: cynkra/quarto-r:1.4.169-4.3.1 commands: - - quarto render - + - quarto render - name: deploy to running app instance image: git.coopcloud.tech/coop-cloud/docker-cp-deploy:latest - settings: - host: washnote.org - service: dev_washnote_com - source: _site - dest: /usr/share/nginx/html/ - deploy_key: - from_secret: drone_ssh_washnote_org + settings: + host: washnote.org + service: dev_washnote_com + source: _site + dest: /usr/share/nginx/html/ + deploy_key: + from_secret: drone_ssh_washnote_org From 19b7d1303a47787b86660460b78ba9baade9695b Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 28 Jun 2023 11:37:09 +0100 Subject: [PATCH 4/6] Fix SSH port for deploy --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f1bce71..9caa0bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,8 @@ steps: image: git.coopcloud.tech/coop-cloud/docker-cp-deploy:latest settings: host: washnote.org - service: dev_washnote_com + port: 222 + service: dev_washnote_org source: _site dest: /usr/share/nginx/html/ deploy_key: From 121e21706fcdc40b1099b10519ed0382292978b0 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 28 Jun 2023 11:38:41 +0100 Subject: [PATCH 5/6] =?UTF-8?q?*Actually*=20fix=20SSH=20port=20?= =?UTF-8?q?=F0=9F=98=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9caa0bc..5f0bf59 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ steps: image: git.coopcloud.tech/coop-cloud/docker-cp-deploy:latest settings: host: washnote.org - port: 222 + port: 2222 service: dev_washnote_org source: _site dest: /usr/share/nginx/html/ From 734927193fdc0de09d8d5aaadee108c85b8a0260 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 28 Jun 2023 11:58:50 +0100 Subject: [PATCH 6/6] `chdir` to fix file path --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5f0bf59..9e99b24 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,8 @@ steps: host: washnote.org port: 2222 service: dev_washnote_org - source: _site + source: . dest: /usr/share/nginx/html/ + chdir: _site deploy_key: from_secret: drone_ssh_washnote_org