From a7b3239b02d53e2a77070c174c77efe64c8d6464 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 14:14:18 +0000
Subject: [PATCH 1/7] fix drone publish

---
 .drone.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e7dc00e..39a81c2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: appleboy/drone-scp
+  image: ryjer/drone-scp
   settings:
     username:
       from_secret: ssh_username
@@ -27,9 +27,9 @@ steps:
       from_secret: ssh_password
     host: open.us.org
     port: 22
-    source: /drone/src/.output/public/
+    rm: true
+    source: ./.output/public/
     target: /dav/www/
-    debug: true
   when:
     branch:
     - main

From d95a152135b79c323587cd3e851f83b4ba2b3022 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 16:27:13 +0000
Subject: [PATCH 2/7] fix drone publish

---
 .drone.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 39a81c2..2b893a1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,7 +7,7 @@ steps:
 - name: build
   image: docker:dind
   environment:
-    COMPOSE_PROJECT_NAME: dav-testing-${DRONE_COMMIT_BRANCH//\//-}
+    COMPOSE_PROJECT_NAME: ${DRONE_REPO_OWNER,,}-${DRONE_REPO_NAME,,}-${DRONE_COMMIT_BRANCH//\//-}
     NUXT_APP_BASE_URL: /${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_COMMIT_BRANCH}/
     SERVICE_3000_CHECK_HTTP: /${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_COMMIT_BRANCH}/
     SERVICE_3000_TAGS: urlprefix-testing.asycn.io/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_COMMIT_BRANCH}/*
@@ -19,7 +19,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: ryjer/drone-scp
+  image: plugins/sftp
   settings:
     username:
       from_secret: ssh_username
@@ -27,9 +27,8 @@ steps:
       from_secret: ssh_password
     host: open.us.org
     port: 22
-    rm: true
-    source: ./.output/public/
-    target: /dav/www/
+    files: ./.output/public/*
+    destination_path: /dav/www/
   when:
     branch:
     - main
@@ -41,6 +40,7 @@ steps:
   when:
     status:
     - success
+    - failure
   settings:
     token:
       from_secret: telegram_token

From 8a29b08f0b7bf0135a0aeadf8cecdbdeaa4a463e Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 17:14:18 +0000
Subject: [PATCH 3/7] fix drone publish

---
 .drone.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2b893a1..27b0907 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: plugins/sftp
+  image: appleboy/drone-scp
   settings:
     username:
       from_secret: ssh_username
@@ -27,8 +27,9 @@ steps:
       from_secret: ssh_password
     host: open.us.org
     port: 22
-    files: ./.output/public/*
-    destination_path: /dav/www/
+    rm: true
+    source: ./.output/public/*
+    target: /dav/www/
   when:
     branch:
     - main

From 2b9860a81d1e32987390ae49c3bb143ef096741c Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 17:15:30 +0000
Subject: [PATCH 4/7] fix drone publish

---
 .drone.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 27b0907..7c1613f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: appleboy/drone-scp
+  image: daniel0ting/drone-scp
   settings:
     username:
       from_secret: ssh_username
@@ -27,9 +27,10 @@ steps:
       from_secret: ssh_password
     host: open.us.org
     port: 22
-    rm: true
-    source: ./.output/public/*
+    source: .output/public
     target: /dav/www/
+    strip.components: 2
+    debug: true
   when:
     branch:
     - main

From d8badbfe516239b22cc6e041e27abc4f720d40a8 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 18:58:34 +0000
Subject: [PATCH 5/7] fix drone publish

---
 .drone.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7c1613f..1136567 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: daniel0ting/drone-scp
+  image: hypervtechnics/drone-sftp
   settings:
     username:
       from_secret: ssh_username
@@ -27,10 +27,8 @@ steps:
       from_secret: ssh_password
     host: open.us.org
     port: 22
-    source: .output/public
     target: /dav/www/
-    strip.components: 2
-    debug: true
+    source: ./.output/public/
   when:
     branch:
     - main

From 8114a9cbfc55a5bcdcec68cfc4b64046b31d2582 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 22:03:02 +0000
Subject: [PATCH 6/7] fix drone publish

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5db03c8..5bba227 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,5 +16,5 @@ COPY --from=master /app/.output/public .
 
 FROM base AS prod
 ENV NODE_ENV=production
-COPY --from=master /app/.output /app/.output
+COPY --from=build /app/.output /app/.output
 CMD [ "node", ".output/server/index.mjs" ]

From aa46d17a47ad61063baccfe1646cbd1e11d45c7f Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Fri, 6 Dec 2024 22:09:31 +0000
Subject: [PATCH 7/7] fix drone publish

---
 .drone.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 1136567..010177b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,6 +29,8 @@ steps:
     port: 22
     target: /dav/www/
     source: ./.output/public/
+    overwrite: true
+    verbose: true
   when:
     branch:
     - main