diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index e241c79..c867611 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -8,21 +8,21 @@ when: branch: [master, master-*, develop, develop-*, feature/*] steps: + db-wait: + image: gitnet.fr/deblan/timeout:latest + commands: + - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done' + secrets: image: gitnet.fr/deblan/novops secrets: [vault_addr, vault_token] commands: - novops load -e build > .secrets - db-wait: - image: gitnet.fr/deblan/timeout:latest - commands: - - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done' - db-create: image: mariadb:10.3 commands: - - . /.secrets + - . .secrets - mysql -hdb -uroot -proot -e "CREATE DATABASE app" - eval "$MYSQLDUMP" | mysql -hdb -uroot -proot app diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml index c5afb1b..1a7e7f4 100644 --- a/.woodpecker/deploy.yml +++ b/.woodpecker/deploy.yml @@ -18,7 +18,7 @@ steps: image: deblan/mage volumes: *volumes commands: - - . ./.secrets + - . .secrets - cd "/builds/$CI_COMMIT_SHA" - mkdir "$HOME/.ssh" - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"