Merge branch 'main' of https://git.open.us.org/RNM/DAV

.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: appleboy/drone-scp
+  image: hypervtechnics/drone-sftp
   settings:
     username:
       from_secret: ssh_username
@@ -27,9 +27,10 @@ steps:
       from_secret: ssh_password
     host: open.us.org
     port: 22
-    source: /drone/src/.output/public/
     target: /dav/www/
-    debug: true
+    source: ./.output/public/
+    overwrite: true
+    verbose: true
   when:
     branch:
     - main
@@ -41,6 +42,7 @@ steps:
   when:
     status:
     - success
+    - failure
   settings:
     token:
       from_secret: telegram_token

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" ]