From 2f32818a72687369b745c9db39fa3fc4b3d35105 Mon Sep 17 00:00:00 2001 From: Philippe Loctaux Date: Tue, 21 Mar 2023 22:06:38 +0100 Subject: [PATCH] deploy with caprover cli --- .woodpecker/.docker.yml | 14 ++++++++++---- .woodpecker/.rust.yml | 1 + crates/ezidam/src/lib.rs | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.woodpecker/.docker.yml b/.woodpecker/.docker.yml index c7a48ef..7bff567 100644 --- a/.woodpecker/.docker.yml +++ b/.woodpecker/.docker.yml @@ -1,8 +1,6 @@ pipeline: + # build docker image with `latest` tag docker-latest: - when: - branch: master - event: push image: woodpeckerci/plugin-docker-buildx settings: registry: https://gitea.y.z.x4m3.rocks @@ -12,5 +10,13 @@ pipeline: repo: gitea.y.z.x4m3.rocks/${CI_REPO_OWNER}/ezidam tag: latest + # deploy + deploy-latest: + image: caprover/cli-caprover:2.2.3 + commands: + - caprover deploy -u $CAPROVER_URL -a $CAPROVER_APP -i gitea.y.z.x4m3.rocks/${CI_REPO_OWNER}/ezidam:latest + secrets: [ CAPROVER_URL, CAPROVER_APP_TOKEN, CAPROVER_APP ] + depends_on: - - rust \ No newline at end of file + - rust +branches: master \ No newline at end of file diff --git a/.woodpecker/.rust.yml b/.woodpecker/.rust.yml index fbaee13..7f8b885 100644 --- a/.woodpecker/.rust.yml +++ b/.woodpecker/.rust.yml @@ -4,6 +4,7 @@ variables: pipeline: test: image: *rust_image + pull: true commands: # setup - rm rust-toolchain.toml # use default installed toolchain diff --git a/crates/ezidam/src/lib.rs b/crates/ezidam/src/lib.rs index 42f581d..3c9447c 100644 --- a/crates/ezidam/src/lib.rs +++ b/crates/ezidam/src/lib.rs @@ -21,7 +21,7 @@ pub fn rocket_setup(rocket_builder: Rocket) -> Rocket { use database::Database; use error::catchers; use response_timer::ResponseTimer; - use rocket::fs::{relative, FileServer}; + use rocket::fs::FileServer; use rocket_dyn_templates::Template; // Response timer