From 96569f2a1237edefc530b0dcdce401794e57e883 Mon Sep 17 00:00:00 2001
From: valere <dev@valerebron.com>
Date: Wed, 23 Aug 2023 12:28:01 +0200
Subject: [PATCH] CI: no .output & USER in drone

---
 .drone.yml   | 16 ++++++++++------
 dockerignore |  1 -
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b3b3a9a..f5fb1b4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,14 +14,18 @@ steps:
       CI_DOMAIN:
         from_secret: CI_DOMAIN
     commands:
-      - apk add --upgrade bash findutils rsync sed
-      - WORKDIR="/opt/pegaz/services/pegazdev"
+      - apk add --upgrade npm bash findutils rsync sed
+      - source /opt/pegaz/config.sh
+      - adduser -D $USERNAME
+      - WORKDIR="/opt/pegaz/services/$DRONE_REPO_NAME"
       - rm -rf $WORKDIR
-      - mkdir $WORKDIR
-      - rsync -av --exclude  ./node_modules /drone/src/ $WORKDIR
+      - su $USERNAME -c "mkdir $WORKDIR"
+      - su $USERNAME -c "rsync -av --exclude  ./node_modules /drone/src/ $WORKDIR"
       - cd $WORKDIR
-      - sed -i "s|DOMAIN=.*|DOMAIN=\"$CI_DOMAIN\"|g" config.sh
-      - bash /opt/pegaz/cli.pegaz.sh up pegazdev
+      - npm install
+      - [[ -f config.sh ]] && sed -i "s|DOMAIN=.*|DOMAIN=\"$CI_DOMAIN\"|g" config.sh
+      - [[ -f .env ]] && sed -i "s|DOMAIN=.*|DOMAIN=\"$CI_DOMAIN\"|g" .env
+      - bash /opt/pegaz/cli.pegaz.sh up $DRONE_REPO_NAME
 
 volumes:
   - name: pegaz
diff --git a/dockerignore b/dockerignore
index 6ef9371..8d231ac 100644
--- a/dockerignore
+++ b/dockerignore
@@ -3,4 +3,3 @@ npm-debug*
 .nuxt
 dist
 tests
-.output