From 8738443f18c8e5cbc4b18df9812c4b9b338e0b30 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Sat, 13 Aug 2022 02:10:08 +0200
Subject: [PATCH 01/76] Init project

---
 .gitignore    |   1 +
 Cargo.lock    | 381 ++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml    |  26 ++++
 README.md     |   2 +-
 src/build.rs  |  16 +++
 src/cli.rs    |  39 ++++++
 src/config.rs |   0
 src/dev.rs    |  16 +++
 src/main.rs   |  17 +++
 src/new.rs    |  79 +++++++++++
 src/start.rs  |  17 +++
 11 files changed, 593 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 Cargo.lock
 create mode 100644 Cargo.toml
 create mode 100644 src/build.rs
 create mode 100644 src/cli.rs
 create mode 100644 src/config.rs
 create mode 100644 src/dev.rs
 create mode 100644 src/main.rs
 create mode 100644 src/new.rs
 create mode 100644 src/start.rs

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..6d4b219
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,381 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "3.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
+dependencies = [
+ "atty",
+ "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "indexmap",
+ "once_cell",
+ "strsim",
+ "termcolor",
+ "textwrap",
+]
+
+[[package]]
+name = "clap_derive"
+version = "3.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "dofigen_lib"
+version = "0.0.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "serde_yaml",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "indexmap"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+
+[[package]]
+name = "lenra_cli"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "dofigen_lib",
+ "env_logger",
+ "log",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.129"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64de3cc433455c14174d42e554d4027ee631c4d046d43e3ecc6efc4636cdc7a7"
+
+[[package]]
+name = "log"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "once_cell"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+
+[[package]]
+name = "ryu"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+
+[[package]]
+name = "serde"
+version = "1.0.143"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.143"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79b7c9017c64a49806c6e8df8ef99b92446d09c92457f85f91835b01a8064ae0"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..13fff5b
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "lenra_cli"
+version = "0.0.0"
+edition = "2021"
+license = "MIT"
+description = "A Dockerfile generator using a simplified description in YAML or JSON format command line tool"
+readme = "../README.md"
+repository = "https://github.com/lenra-io/dofigen"
+keywords = ["cli", "dockerfile", "generator", "yaml", "json"]
+categories = ["command-line-utilities"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bin]]
+edition = "2021"
+name = "lenra"
+path = "src/main.rs"
+
+[dependencies]
+dofigen_lib = { path = "../dofigen/dofigen_lib", version = "0.0.0" }
+clap = { version = "3.2", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_yaml = "0.9.2"
+log = "0.4.17"
+env_logger = "0.9.0"
diff --git a/README.md b/README.md
index 5fc8690..3513421 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# lenra-cli
+# lenra_cli
 The Lenra's command line interface
diff --git a/src/build.rs b/src/build.rs
new file mode 100644
index 0000000..0ab79b8
--- /dev/null
+++ b/src/build.rs
@@ -0,0 +1,16 @@
+pub use clap::Args;
+
+use crate::cli::CliSubcommand;
+
+#[derive(Args)]
+pub struct Build {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = "lenra.config.yml")]
+    pub config: std::path::PathBuf,
+}
+
+impl CliSubcommand for Build {
+    fn run(&self) {
+        todo!()
+    }
+}
\ No newline at end of file
diff --git a/src/cli.rs b/src/cli.rs
new file mode 100644
index 0000000..4b4c16c
--- /dev/null
+++ b/src/cli.rs
@@ -0,0 +1,39 @@
+pub use clap::{Args, Parser, Subcommand};
+
+use crate::{build::Build, dev::Dev, new::New, start::Start};
+
+/// The Lenra CLI arguments to manage your local app development.
+#[derive(Parser)]
+#[clap(author, version, about, long_about = None)]
+pub struct Cli {
+    #[clap(subcommand)]
+    pub command: Command,
+}
+
+pub trait CliSubcommand {
+    fn run(&self);
+}
+
+/// The subcommands
+#[derive(Subcommand)]
+pub enum Command {
+    /// Create a new Lenra app project
+    New(New),
+    /// Start your app in development mode
+    Dev(Dev),
+    /// Build your app in release mode
+    Build(Build),
+    /// Start your app previously built with the build command
+    Start(Start),
+}
+
+impl CliSubcommand for Command {
+    fn run(&self) {
+        match self {
+            Command::New(new) => new.run(),
+            Command::Dev(dev) => dev.run(),
+            Command::Build(build) => build.run(),
+            Command::Start(start) => start.run(),
+        };
+    }
+}
diff --git a/src/config.rs b/src/config.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/dev.rs b/src/dev.rs
new file mode 100644
index 0000000..e26a0cd
--- /dev/null
+++ b/src/dev.rs
@@ -0,0 +1,16 @@
+pub use clap::Args;
+
+use crate::cli::CliSubcommand;
+
+#[derive(Args)]
+pub struct Dev {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = "lenra.config.yml")]
+    pub config: std::path::PathBuf,
+}
+
+impl CliSubcommand for Dev {
+    fn run(&self) {
+        todo!()
+    }
+}
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..961fe8e
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,17 @@
+use clap::Parser;
+use cli::{Cli, CliSubcommand};
+use env_logger;
+
+mod build;
+mod cli;
+mod config;
+mod dev;
+mod new;
+mod start;
+
+fn main() {
+    env_logger::init();
+    let args = Cli::parse();
+    // TODO: manage config file
+    args.command.run();
+}
diff --git a/src/new.rs b/src/new.rs
new file mode 100644
index 0000000..f8ca9df
--- /dev/null
+++ b/src/new.rs
@@ -0,0 +1,79 @@
+pub use clap::Args;
+use log;
+use std::fs;
+use std::process::Command;
+
+use crate::cli::CliSubcommand;
+
+#[derive(Args)]
+pub struct New {
+    /// The project template
+    pub template: String,
+
+    /// The target project path
+    #[clap(parse(from_os_str))]
+    path: std::path::PathBuf,
+
+    /// The project name
+    #[clap(long)]
+    pub name: Option<String>,
+}
+
+impl CliSubcommand for New {
+    fn run(&self) {
+        if self.path.exists() {
+            panic!("The path '{}' already exists", self.path.display())
+        }
+        let template = format!("https://github.com/lenra-io/template-{}", self.template);
+        let download_url = format!("{}/archive/refs/heads/main.zip", template);
+        let name = if let Some(n) = &self.name {
+            // TODO: check name pattern
+            n.clone()
+        } else {
+            String::from(self.path.file_name().unwrap().to_str().unwrap())
+        };
+        println!(
+            "new project {} from tempalte {}[{}]",
+            name, template, download_url
+        );
+
+        log::debug!("clone the template");
+        match Command::new("git")
+            .arg("clone")
+            .arg(template)
+            .arg(self.path.as_os_str())
+            .spawn()
+        {
+            Ok(child) => {
+                child.wait_with_output().expect("Failed to clone the template");
+            }
+            Err(e) => match e.kind() {
+                std::io::ErrorKind::NotFound => panic!("`git` was not found!"),
+                _ => panic!("Some unkown error occurred"),
+            },
+        }
+
+        log::debug!("remove git directory");
+        fs::remove_dir_all(self.path.join(".git")).unwrap();
+
+        log::debug!("init git project");
+        Command::new("git")
+            .current_dir(self.path.as_os_str())
+            .arg("init")
+            .output()
+            .expect("Failed initiating git project");
+        Command::new("git")
+            .current_dir(self.path.as_os_str())
+            .arg("add")
+            .arg(".")
+            .output()
+            .expect("Failed during git add");
+        Command::new("git")
+            .current_dir(self.path.as_os_str())
+            .arg("commit")
+            .arg("-m")
+            .arg("Init project")
+            .output()
+            .expect("Failed during git add");
+    }
+}
diff --git a/src/start.rs b/src/start.rs
new file mode 100644
index 0000000..8770a70
--- /dev/null
+++ b/src/start.rs
@@ -0,0 +1,17 @@
+pub use clap::Args;
+
+use crate::cli::CliSubcommand;
+
+
+#[derive(Args)]
+pub struct Start {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = "lenra.config.yml")]
+    pub config: std::path::PathBuf,
+}
+
+impl CliSubcommand for Start {
+    fn run(&self) {
+        todo!()
+    }
+}
\ No newline at end of file

From c4127d0cb52d89c1de3473b262583abc460dfe18 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Sat, 13 Aug 2022 14:33:32 +0200
Subject: [PATCH 02/76] feat: Template check

---
 Cargo.lock |  8 ++++++++
 Cargo.toml |  2 ++
 src/new.rs | 46 +++++++++++++++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d4b219..f64f211 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,6 +144,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "lenra_cli"
 version = "0.0.0"
@@ -151,7 +157,9 @@ dependencies = [
  "clap",
  "dofigen_lib",
  "env_logger",
+ "lazy_static",
  "log",
+ "regex",
  "serde",
  "serde_json",
  "serde_yaml",
diff --git a/Cargo.toml b/Cargo.toml
index 13fff5b..6c398f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,3 +24,5 @@ serde_json = "1.0"
 serde_yaml = "0.9.2"
 log = "0.4.17"
 env_logger = "0.9.0"
+regex = "1.6.0"
+lazy_static = "1.4.0"
diff --git a/src/new.rs b/src/new.rs
index f8ca9df..8fc56f6 100644
--- a/src/new.rs
+++ b/src/new.rs
@@ -1,5 +1,7 @@
 pub use clap::Args;
+use lazy_static::lazy_static;
 use log;
+use regex::Regex;
 use std::fs;
 use std::process::Command;
 
@@ -7,10 +9,13 @@ use crate::cli::CliSubcommand;
 
 #[derive(Args)]
 pub struct New {
-    /// The project template
+    /// The project template from which your project will be created.
+    /// For example, defining `rust` or `template-rust` will use the next one: https://github.com/lenra-io/template-rust
+    /// You can find all our templates at this url: https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
+    /// You also can set the template project full url to use custom ones.
     pub template: String,
 
-    /// The target project path
+    /// The project path
     #[clap(parse(from_os_str))]
     path: std::path::PathBuf,
 
@@ -19,25 +24,42 @@ pub struct New {
     pub name: Option<String>,
 }
 
+lazy_static! {
+    static ref TEMPLATE_SHORT_REGEX: Regex =
+        Regex::new(r"^(template-)?([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
+    static ref NAME_REGEX: Regex =
+        Regex::new(r"^([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
+}
+
 impl CliSubcommand for New {
     fn run(&self) {
         if self.path.exists() {
             panic!("The path '{}' already exists", self.path.display())
         }
-        let template = format!("https://github.com/lenra-io/template-{}", self.template);
-        let download_url = format!("{}/archive/refs/heads/main.zip", template);
+
+        let template = if TEMPLATE_SHORT_REGEX.is_match(self.template.as_str()) {
+            format!(
+                "https://github.com/lenra-io/template-{}",
+                TEMPLATE_SHORT_REGEX.replace(self.template.as_str(), "$2")
+            )
+        } else {
+            self.template.clone()
+        };
+        
         let name = if let Some(n) = &self.name {
-            // TODO: check name pattern
+            if !NAME_REGEX.is_match(n) {
+                panic!("The specified name does not seems correct. Does not match the regex {}", NAME_REGEX.as_str());
+            }
             n.clone()
         } else {
             String::from(self.path.file_name().unwrap().to_str().unwrap())
         };
-        println!(
-            "new project {} from tempalte {}[{}]",
-            name, template, download_url
-        );
 
-        log::debug!("clone the template");
+        log::debug!(
+            "clone the template {} into {}",
+            template,
+            self.path.display()
+        );
         match Command::new("git")
             .arg("clone")
             .arg(template)
@@ -45,7 +67,9 @@ impl CliSubcommand for New {
             .spawn()
         {
             Ok(child) => {
-                child.wait_with_output().expect("Failed to clone the template");
+                child
+                    .wait_with_output()
+                    .expect("Failed to clone the template");
             }
             Err(e) => match e.kind() {
                 std::io::ErrorKind::NotFound => panic!("`git` was not found!"),

From 33d99e257712fec0e9f9ee9e33b5db6dae0a3431 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Sat, 13 Aug 2022 14:36:15 +0200
Subject: [PATCH 03/76] fix: Name not needed

---
 src/new.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/new.rs b/src/new.rs
index 8fc56f6..95d377d 100644
--- a/src/new.rs
+++ b/src/new.rs
@@ -18,17 +18,11 @@ pub struct New {
     /// The project path
     #[clap(parse(from_os_str))]
     path: std::path::PathBuf,
-
-    /// The project name
-    #[clap(long)]
-    pub name: Option<String>,
 }
 
 lazy_static! {
     static ref TEMPLATE_SHORT_REGEX: Regex =
         Regex::new(r"^(template-)?([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
-    static ref NAME_REGEX: Regex =
-        Regex::new(r"^([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
 }
 
 impl CliSubcommand for New {
@@ -45,15 +39,6 @@ impl CliSubcommand for New {
         } else {
             self.template.clone()
         };
-        
-        let name = if let Some(n) = &self.name {
-            if !NAME_REGEX.is_match(n) {
-                panic!("The specified name does not seems correct. Does not match the regex {}", NAME_REGEX.as_str());
-            }
-            n.clone()
-        } else {
-            String::from(self.path.file_name().unwrap().to_str().unwrap())
-        };
 
         log::debug!(
             "clone the template {} into {}",

From 2ec4cca4be7f5669276b3f84b10410c8730de01c Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Sat, 13 Aug 2022 16:32:09 +0200
Subject: [PATCH 04/76] docs: First part

---
 Cargo.toml    |   6 +--
 README.md     | 147 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/build.rs  |   5 +-
 src/config.rs |   1 +
 src/dev.rs    |   3 +-
 src/main.rs   |   4 ++
 src/new.rs    |   4 ++
 src/start.rs  |   6 +--
 8 files changed, 165 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6c398f2..56ff0cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,10 +3,10 @@ name = "lenra_cli"
 version = "0.0.0"
 edition = "2021"
 license = "MIT"
-description = "A Dockerfile generator using a simplified description in YAML or JSON format command line tool"
+description = "THe Lenra's command line interface"
 readme = "../README.md"
-repository = "https://github.com/lenra-io/dofigen"
-keywords = ["cli", "dockerfile", "generator", "yaml", "json"]
+repository = "https://github.com/lenra-io/lenra_cli"
+keywords = ["cli", "lenra"]
 categories = ["command-line-utilities"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/README.md b/README.md
index 3513421..fc41d56 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,145 @@
-# lenra_cli
-The Lenra's command line interface
+<div id="top"></div>
+<!--
+*** Thanks for checking out the Best-README-Template. If you have a suggestion
+*** that would make this better, please fork the repo and create a pull request
+*** or simply open an issue with the tag "enhancement".
+*** Don't forget to give the project a star!
+*** Thanks again! Now go create something AMAZING! :D
+-->
+
+
+
+<!-- PROJECT SHIELDS -->
+<!--
+*** I'm using markdown "reference style" links for readability.
+*** Reference links are enclosed in brackets [ ] instead of parentheses ( ).
+*** See the bottom of this document for the declaration of the reference variables
+*** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
+*** https://www.markdownguide.org/basic-syntax/#reference-style-links
+-->
+[![Contributors][contributors-shield]][contributors-url]
+[![Forks][forks-shield]][forks-url]
+[![Stargazers][stars-shield]][stars-url]
+[![Issues][issues-shield]][issues-url]
+[![MIT License][license-shield]][license-url]
+
+# Lenra cli
+
+The Lenra's command line interface.
+
+[Report Bug](https://github.com/lenra-io/lenra_cli/issues)
+·
+[Request Feature](https://github.com/lenra-io/lenra_cli/issues)
+
+<!-- GETTING STARTED -->
+## Getting Started
+
+### Prerequisites
+
+Install the Lenra's cli using one of the next possibilities.
+
+#### Cargo install
+
+First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
+
+Then use the next command to install the Lenra's cli:
+
+```bash
+cargo install lenra_cli
+```
+
+#### Download the binary
+
+You can download the binary from [the release page](https://github.com/lenra-io/lenra_cli/releases) and add it to your path environment variable.
+
+#### Use it with Docker
+
+You can run cli directly from it Docker image with the next command:
+
+```bash
+docker run --rm -it -v $(pwd):/app lenra/cli
+```
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+### How to use it
+
+Use the help options to understand how to use it:
+
+```bash
+$ lenra --help
+lenra_cli 0.0.0
+A Dockerfile generator using a simplified description in YAML or JSON format command line tool
+
+USAGE:
+    lenra <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help       Print help information
+    -V, --version    Print version information
+
+SUBCOMMANDS:
+    build    Build your app in release mode
+    dev      Start your app in development mode
+    help     Print this message or the help of the given subcommand(s)
+    new      Create a new Lenra app project
+    start    Start your app previously built with the build command
+```
+
+### Configuration file
+
+The Lenra's configuration file `lenra.yml` describes your Lenra app configurations, like API versions or how to build it.
+
+#### Configuration
+
+The configuration is the main element of the file:
+
+| Field            | Type             | Description                   |
+|------------------|------------------|-------------------------------|
+| `componentsApi`  | String           | The components API version    |
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+<!-- CONTRIBUTING -->
+## Contributing
+
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+
+If you have a suggestion that would make this better, please open an issue with the tag "enhancement" or "bug".
+Don't forget to give the project a star! Thanks again!
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+
+
+<!-- LICENSE -->
+## License
+
+Distributed under the **MIT** License. See [LICENSE](./LICENSE) for more information.
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+
+
+<!-- CONTACT -->
+## Contact
+
+Lenra - [@lenra_dev](https://twitter.com/lenra_dev) - contact@lenra.io
+
+Project Link: [https://github.com/lenra-io/lenra_cli](https://github.com/lenra-io/lenra_cli)
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+
+<!-- MARKDOWN LINKS & IMAGES -->
+<!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+[contributors-shield]: https://img.shields.io/github/contributors/lenra-io/lenra_cli.svg?style=for-the-badge
+[contributors-url]: https://github.com/lenra-io/lenra_cli/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/lenra-io/lenra_cli.svg?style=for-the-badge
+[forks-url]: https://github.com/lenra-io/lenra_cli/network/members
+[stars-shield]: https://img.shields.io/github/stars/lenra-io/lenra_cli.svg?style=for-the-badge
+[stars-url]: https://github.com/lenra-io/lenra_cli/stargazers
+[issues-shield]: https://img.shields.io/github/issues/lenra-io/lenra_cli.svg?style=for-the-badge
+[issues-url]: https://github.com/lenra-io/lenra_cli/issues
+[license-shield]: https://img.shields.io/github/license/lenra-io/lenra_cli.svg?style=for-the-badge
+[license-url]: https://github.com/lenra-io/lenra_cli/blob/master/LICENSE.txt
diff --git a/src/build.rs b/src/build.rs
index 0ab79b8..a00496f 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -1,11 +1,12 @@
 pub use clap::Args;
 
 use crate::cli::CliSubcommand;
+use crate::config::DEFAULT_CONFIG_FILE;
 
 #[derive(Args)]
 pub struct Build {
     /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = "lenra.config.yml")]
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 }
 
@@ -13,4 +14,4 @@ impl CliSubcommand for Build {
     fn run(&self) {
         todo!()
     }
-}
\ No newline at end of file
+}
diff --git a/src/config.rs b/src/config.rs
index e69de29..d35bc51 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -0,0 +1 @@
+pub static DEFAULT_CONFIG_FILE: &str = "lenra.yml";
diff --git a/src/dev.rs b/src/dev.rs
index e26a0cd..745d3b1 100644
--- a/src/dev.rs
+++ b/src/dev.rs
@@ -1,11 +1,12 @@
 pub use clap::Args;
 
 use crate::cli::CliSubcommand;
+use crate::config::DEFAULT_CONFIG_FILE;
 
 #[derive(Args)]
 pub struct Dev {
     /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = "lenra.config.yml")]
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 }
 
diff --git a/src/main.rs b/src/main.rs
index 961fe8e..3266afa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,7 @@
+//! # lenra_cli
+//!
+//! The Lenra's command line interface
+ 
 use clap::Parser;
 use cli::{Cli, CliSubcommand};
 use env_logger;
diff --git a/src/new.rs b/src/new.rs
index 95d377d..6371714 100644
--- a/src/new.rs
+++ b/src/new.rs
@@ -1,3 +1,7 @@
+//! # new
+//!
+//! The new subcommand creates a new Lenra app project from a given template and into a given path
+ 
 pub use clap::Args;
 use lazy_static::lazy_static;
 use log;
diff --git a/src/start.rs b/src/start.rs
index 8770a70..dfe0c8f 100644
--- a/src/start.rs
+++ b/src/start.rs
@@ -1,12 +1,12 @@
 pub use clap::Args;
 
 use crate::cli::CliSubcommand;
-
+use crate::config::DEFAULT_CONFIG_FILE;
 
 #[derive(Args)]
 pub struct Start {
     /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = "lenra.config.yml")]
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 }
 
@@ -14,4 +14,4 @@ impl CliSubcommand for Start {
     fn run(&self) {
         todo!()
     }
-}
\ No newline at end of file
+}

From 72555b4bb10347d67afae09882c6e30a4985f1b1 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Sun, 14 Aug 2022 01:45:50 +0200
Subject: [PATCH 05/76] feat: Only the last commit of the main branch

---
 src/main.rs | 2 +-
 src/new.rs  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3266afa..c26fbe0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 //! # lenra_cli
 //!
 //! The Lenra's command line interface
- 
+
 use clap::Parser;
 use cli::{Cli, CliSubcommand};
 use env_logger;
diff --git a/src/new.rs b/src/new.rs
index 6371714..1e29cab 100644
--- a/src/new.rs
+++ b/src/new.rs
@@ -1,7 +1,7 @@
 //! # new
 //!
 //! The new subcommand creates a new Lenra app project from a given template and into a given path
- 
+
 pub use clap::Args;
 use lazy_static::lazy_static;
 use log;
@@ -51,6 +51,9 @@ impl CliSubcommand for New {
         );
         match Command::new("git")
             .arg("clone")
+            .arg("--single-branch")
+            .arg("--depth")
+            .arg("1")
             .arg(template)
             .arg(self.path.as_os_str())
             .spawn()

From b4ebd7a24b67902bf7855975c2847830dd90b549 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Thu, 18 Aug 2022 15:21:12 +0200
Subject: [PATCH 06/76] feat: Implement build command (#4)

---
 Cargo.lock    |  54 ++++++++---
 Cargo.toml    |   2 +-
 README.md     |  82 +++++++++++++++-
 src/build.rs  | 259 ++++++++++++++++++++++++++++++++++++++++++++++++--
 src/cli.rs    |   9 +-
 src/config.rs |  64 +++++++++++++
 src/dev.rs    |  17 ----
 src/main.rs   |   4 +-
 src/new.rs    |   4 +-
 src/start.rs  |   4 +-
 10 files changed, 445 insertions(+), 54 deletions(-)
 delete mode 100644 src/dev.rs

diff --git a/Cargo.lock b/Cargo.lock
index f64f211..4bf7809 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,9 +42,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.2.16"
+version = "3.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
+checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
 dependencies = [
  "atty",
  "bitflags",
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.15"
+version = "3.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
+checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -80,12 +80,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "dofigen_lib"
-version = "0.0.0"
+name = "dofigen"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71144688ed025d3b62fa7f2d24f6f72891843c49976869c6d4b9927490ce9360"
 dependencies = [
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
+ "thiserror",
 ]
 
 [[package]]
@@ -155,7 +159,7 @@ name = "lenra_cli"
 version = "0.0.0"
 dependencies = [
  "clap",
- "dofigen_lib",
+ "dofigen",
  "env_logger",
  "lazy_static",
  "log",
@@ -167,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.129"
+version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64de3cc433455c14174d42e554d4027ee631c4d046d43e3ecc6efc4636cdc7a7"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
 
 [[package]]
 name = "log"
@@ -188,15 +192,15 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "once_cell"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
 
 [[package]]
 name = "os_str_bytes"
-version = "6.2.0"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
 
 [[package]]
 name = "proc-macro-error"
@@ -296,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.4"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b7c9017c64a49806c6e8df8ef99b92446d09c92457f85f91835b01a8064ae0"
+checksum = "f50845f68d5c693aac7d72a25415ddd21cb8182c04eafe447b73af55a05f9e1b"
 dependencies = [
  "indexmap",
  "itoa",
@@ -339,6 +343,26 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
 
+[[package]]
+name = "thiserror"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.3"
diff --git a/Cargo.toml b/Cargo.toml
index 56ff0cd..6b64d92 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,6 @@ name = "lenra"
 path = "src/main.rs"
 
 [dependencies]
-dofigen_lib = { path = "../dofigen/dofigen_lib", version = "0.0.0" }
 clap = { version = "3.2", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -26,3 +25,4 @@ log = "0.4.17"
 env_logger = "0.9.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
+dofigen = "1"
diff --git a/README.md b/README.md
index fc41d56..0242657 100644
--- a/README.md
+++ b/README.md
@@ -80,15 +80,73 @@ OPTIONS:
 
 SUBCOMMANDS:
     build    Build your app in release mode
-    dev      Start your app in development mode
     help     Print this message or the help of the given subcommand(s)
     new      Create a new Lenra app project
     start    Start your app previously built with the build command
 ```
 
+### Subcommands
+
+This tools contains many subcommands to help you doing what you need.
+
+- [new](#new): creates a new Lenra app project
+- [build](#build): builds the Lenra app of the current directory
+
+#### new
+
+This subcommand creates a new Lenra app project from a given template and in a given directory.
+The target directory must not exist.
+
+```bash
+$ lenra new --help
+lenra-new 
+Create a new Lenra app project
+
+USAGE:
+    lenra new <TEMPLATE> <PATH>
+
+ARGS:
+    <TEMPLATE>    The project template from which your project will be created. For example,
+                  defining `rust` or `template-rust` will use the next one:
+                  https://github.com/lenra-io/template-rust You can find all our templates at
+                  this url:
+                  https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
+                  You also can set the template project full url to use custom ones
+    <PATH>        The project path
+
+OPTIONS:
+    -h, --help    Print help information
+```
+
+#### build
+
+This subcommand builds the Lenra app of the current directory.
+The app configuration are defined by a [configuration file](#configuration-file).
+
+```bash
+$ lenra build --help
+lenra-build 
+Build your app in release mode
+
+USAGE:
+    lenra build [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
+
 ### Configuration file
 
-The Lenra's configuration file `lenra.yml` describes your Lenra app configurations, like API versions or how to build it.
+The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
+
+Here is an example using a Dofigen file:
+
+```yaml
+componentsApi: "1.0"
+generator:
+  dofigen: dofigen.yml
+```
 
 #### Configuration
 
@@ -97,6 +155,26 @@ The configuration is the main element of the file:
 | Field            | Type             | Description                   |
 |------------------|------------------|-------------------------------|
 | `componentsApi`  | String           | The components API version    |
+| `generator`      | [Generator](#generator)  The generator configuration |
+
+#### Generator
+
+The generator define your application is built. There are many configurators:
+
+- [Dofigen](#dofigen)
+- [Docker](#docker)
+
+##### Dofigen
+
+The Dofigen generator use a [Dofigen](https://github.com/lenra-io/dofigen) configuration to generate the Docker image.
+
+The Dofigen configuration can be the path to a Dofigen file or it content directly.
+
+##### Docker
+
+The Docker generator use a Dockerfile to generate the Docker image.
+
+The Dockerfile can be the path to a file or it content directly.
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
diff --git a/src/build.rs b/src/build.rs
index a00496f..a8b0f50 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -1,17 +1,264 @@
-pub use clap::Args;
+use log;
+use std::collections::HashMap;
+use std::fs;
+use std::path::PathBuf;
+use std::process::{Command, Stdio};
 
-use crate::cli::CliSubcommand;
-use crate::config::DEFAULT_CONFIG_FILE;
+use clap;
+use dofigen_lib::{
+    from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder, Image,
+};
 
-#[derive(Args)]
+use crate::cli::CliCommand;
+use crate::config::{load_config_file, Generator, DEFAULT_CONFIG_FILE, LENRA_CACHE_DIRECTORY};
+
+static OF_WATCHDOG_BUILDER: &str = "of-watchdog";
+static OF_WATCHDOG_IMAGE: &str = "ghcr.io/openfaas/of-watchdog";
+static OF_WATCHDOG_VERSION: &str = "0.9.6";
+
+#[derive(clap::Args)]
 pub struct Build {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
+
+    /// The app configuration file.
+    #[clap(value_enum, long, default_value = "local")]
+    pub cache: Cache,
+}
+
+#[derive(clap::ValueEnum, Clone, Debug)]
+pub enum Cache {
+    Local,
+    Inline,
+    Image,
+    No,
+}
+
+impl Build {
+    /// Builds a Docker image from a Dofigen structure
+    fn build_dofigen(&self, image: Image) {
+        // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
+        let of_overlay = self.dofigen_of_overlay(image);
+
+        // generate the Dockerfile and .dockerignore files with Dofigen
+        let dockerfile = generate_dockerfile(&of_overlay);
+        let dockerignore = generate_dockerignore(&of_overlay);
+        self.save_docker_content(dockerfile, Some(dockerignore));
+
+        // build the generated Dockerfile
+        self.build_docker_image(None);
+    }
+
+    /// Add an overlay to the given Dofigen structure to manage OpenFaaS
+    fn dofigen_of_overlay(&self, image: Image) -> Image {
+        log::info!("Adding OpenFaaS overlay to the Dofigen descriptor");
+        let mut builders = if let Some(vec) = image.builders {
+            vec
+        } else {
+            Vec::new()
+        };
+        builders.push(Builder {
+            name: Some(String::from(OF_WATCHDOG_BUILDER)),
+            image: format!("{}:{}", OF_WATCHDOG_IMAGE, OF_WATCHDOG_VERSION),
+            ..Default::default()
+        });
+
+        let mut artifacts = if let Some(arts) = image.artifacts {
+            arts
+        } else {
+            Vec::new()
+        };
+        artifacts.push(Artifact {
+            builder: OF_WATCHDOG_BUILDER.to_string(),
+            source: "/fwatchdog".to_string(),
+            destination: "/fwatchdog".to_string(),
+        });
+
+        let mut envs = if let Some(envs) = image.envs {
+            envs
+        } else {
+            HashMap::new()
+        };
+
+        if let Some(ports) = image.ports {
+            if ports.len() == 1 {
+                envs.insert("mode".to_string(), "http".to_string());
+                envs.insert(
+                    "upstream_url".to_string(),
+                    format!("http://127.0.0.1:{}", ports[0]),
+                );
+            } else if ports.len() > 1 {
+                panic!("More than one port has been defined in the Dofigen descriptor");
+            }
+        };
+
+        if image.entrypoint.is_some() {
+            panic!("The Dofigen descriptor can't have entrypoint defined. Use cmd instead");
+        }
+
+        if let Some(cmd) = image.cmd {
+            envs.insert("fprocess".to_string(), cmd.join(" "));
+        } else {
+            panic!("The Dofigen cmd property is not defined");
+        }
+
+        Image {
+            image: image.image,
+            builders: Some(builders),
+            artifacts: Some(artifacts),
+            ports: Some(vec![8080]),
+            envs: Some(envs),
+            entrypoint: None,
+            cmd: Some(vec!["/fwatchdog".to_string()]),
+            user: image.user,
+            workdir: image.workdir,
+            adds: image.adds,
+            root: image.root,
+            script: image.script,
+            caches: image.caches,
+            healthcheck: image.healthcheck,
+            ignores: image.ignores,
+        }
+    }
+
+    /// Saves the Dockerfile and dockerignore (if present) files from their contents
+    fn save_docker_content(
+        &self,
+        dockerfile_content: String,
+        dockerignore_content: Option<String>,
+    ) {
+        let dockerfile_path: PathBuf = [LENRA_CACHE_DIRECTORY, "Dockerfile"].iter().collect();
+        let dockerignore_path: PathBuf = [LENRA_CACHE_DIRECTORY, ".dockerignore"].iter().collect();
+
+        fs::write(dockerfile_path, dockerfile_content).expect("Unable to write the Dockerfile");
+        if let Some(content) = dockerignore_content {
+            fs::write(dockerignore_path, content).expect("Unable to write the .dockerignore file");
+        }
+    }
+
+    /// Builds a Dockerfile. If None, get's it at the default path: ./.lenra/Dockerfile
+    fn build_docker_image(&self, dockerfile: Option<PathBuf>) {
+        log::info!("Build the Docker image");
+        let dockerfile_path: PathBuf =
+            dockerfile.unwrap_or([LENRA_CACHE_DIRECTORY, "Dockerfile"].iter().collect());
+        let cache_directory: PathBuf = [LENRA_CACHE_DIRECTORY, "dockercache"].iter().collect();
+        let mut command = Command::new("docker");
+        let image_name = "lenra/app";
+
+        // TODO: display std out & err
+        command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
+        command
+            .arg("buildx")
+            .arg("build")
+            .arg("-f")
+            .arg(dockerfile_path);
+
+        match self.cache {
+            Cache::Inline => command
+                .arg("--cache-to=type=inline")
+                .arg(format!("--cache-from={}", image_name)),
+            Cache::Local => command
+                .arg(format!(
+                    "--cache-to=type=local,dest={}",
+                    cache_directory.display()
+                ))
+                .arg(format!(
+                    "--cache-from=type=local,src={}",
+                    cache_directory.display()
+                )),
+            Cache::Image => command
+                .arg(format!("--cache-to={}:cache", image_name))
+                .arg(format!("--cache-from={}:cache", image_name)),
+            Cache::No => &command,
+        };
+        command.arg("-t").arg(image_name).arg("--load").arg(".");
+
+        log::debug!("Build image: {:?}", command);
+        let output = command.output().expect("Failed building the Docker image");
+        if !output.status.success() {
+            panic!(
+                "An error occured while building the Docker image:\n{}\n{}",
+                String::from_utf8(output.stdout).unwrap(),
+                String::from_utf8(output.stderr).unwrap()
+            )
+        }
+        log::info!("Image built");
+    }
 }
 
-impl CliSubcommand for Build {
+impl CliCommand for Build {
     fn run(&self) {
-        todo!()
+        let conf = load_config_file(&self.config);
+        // TODO: check the components API version
+
+        // create the `.lenra` cache directory
+        fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
+
+        match conf.generator {
+            Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen),
+            Generator::DofigenFile(dofigen_file) => self.build_dofigen(
+                from_file_path(&dofigen_file.dofigen).expect("Failed loading the Dofigen file"),
+            ),
+            Generator::DofigenError { dofigen: _ } => {
+                panic!("Your Dofigen configuration is not correct")
+            }
+            Generator::Dockerfile(dockerfile) => self.build_docker_image(Some(dockerfile.docker)),
+            Generator::Docker(docker) => {
+                self.save_docker_content(docker.docker, docker.ignore);
+                self.build_docker_image(None);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod dofigen_of_overlay_tests {
+    use super::*;
+
+    #[test]
+    fn simple_image() {
+        let build = Build {
+            config: DEFAULT_CONFIG_FILE.into(),
+            cache: Cache::Inline,
+        };
+        let image = Image {
+            image: "my-dockerimage".into(),
+            cmd: Some(vec!["/app/my-app".into()]),
+            ..Default::default()
+        };
+        let overlayed_image = Image {
+            builders: Some(vec![Builder {
+                name: Some("of-watchdog".into()),
+                image: format!("ghcr.io/openfaas/of-watchdog:{}", OF_WATCHDOG_VERSION),
+                ..Default::default()
+            }]),
+            image: String::from("my-dockerimage"),
+            envs: Some([("fprocess".to_string(), "/app/my-app".to_string())].into()),
+            artifacts: Some(vec![Artifact {
+                builder: "of-watchdog".into(),
+                source: "/fwatchdog".into(),
+                destination: "/fwatchdog".into(),
+            }]),
+            ports: Some(vec![8080]),
+            cmd: Some(vec!["/fwatchdog".into()]),
+            ..Default::default()
+        };
+
+        assert_eq!(build.dofigen_of_overlay(image), overlayed_image);
+    }
+
+    #[test]
+    #[should_panic]
+    fn no_cmd() {
+        let build = Build {
+            config: DEFAULT_CONFIG_FILE.into(),
+            cache: Cache::Inline,
+        };
+        let image = Image {
+            image: "my-dockerimage".into(),
+            ..Default::default()
+        };
+        build.dofigen_of_overlay(image);
     }
 }
diff --git a/src/cli.rs b/src/cli.rs
index 4b4c16c..c2b94ef 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,6 +1,6 @@
 pub use clap::{Args, Parser, Subcommand};
 
-use crate::{build::Build, dev::Dev, new::New, start::Start};
+use crate::{build::Build, new::New, start::Start};
 
 /// The Lenra CLI arguments to manage your local app development.
 #[derive(Parser)]
@@ -10,7 +10,7 @@ pub struct Cli {
     pub command: Command,
 }
 
-pub trait CliSubcommand {
+pub trait CliCommand {
     fn run(&self);
 }
 
@@ -19,19 +19,16 @@ pub trait CliSubcommand {
 pub enum Command {
     /// Create a new Lenra app project
     New(New),
-    /// Start your app in development mode
-    Dev(Dev),
     /// Build your app in release mode
     Build(Build),
     /// Start your app previously built with the build command
     Start(Start),
 }
 
-impl CliSubcommand for Command {
+impl CliCommand for Command {
     fn run(&self) {
         match self {
             Command::New(new) => new.run(),
-            Command::Dev(dev) => dev.run(),
             Command::Build(build) => build.run(),
             Command::Start(start) => start.run(),
         };
diff --git a/src/config.rs b/src/config.rs
index d35bc51..72d5526 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1 +1,65 @@
+use std::fs;
+
+use dofigen_lib::Image;
+use serde::{Deserialize, Serialize};
+use serde_yaml::Value;
+
 pub static DEFAULT_CONFIG_FILE: &str = "lenra.yml";
+pub static LENRA_CACHE_DIRECTORY: &str = ".lenra";
+
+pub fn load_config_file(path: &std::path::PathBuf) -> Application {
+    let file = fs::File::open(path).unwrap();
+    match path.extension() {
+        Some(os_str) => match os_str.to_str() {
+            Some("yml" | "yaml") => serde_yaml::from_reader(file).unwrap(),
+            Some("json") => serde_json::from_reader(file).unwrap(),
+            Some(ext) => panic!("Not managed config file extension {}", ext),
+            None => panic!("The config file has no extension"),
+        },
+        None => panic!("The config file has no extension"),
+    }
+}
+
+/** The main component of the config file */
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct Application {
+    #[serde(rename = "componentsApi")]
+    pub components_api: String,
+    pub generator: Generator,
+}
+
+/** The application generator configuration */
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[serde(untagged)]
+pub enum Generator {
+    Dofigen(Dofigen),
+    DofigenFile(DofigenFile),
+    DofigenError { dofigen: Value },
+    Dockerfile(Dockerfile),
+    Docker(Docker),
+}
+
+/** The Dofigen configuration */
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+pub struct Dofigen {
+    pub dofigen: Image,
+}
+
+/** The Dofigen configuration file */
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+pub struct DofigenFile {
+    pub dofigen: std::path::PathBuf,
+}
+
+/** The Docker configuration */
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+pub struct Docker {
+    pub docker: String,
+    pub ignore: Option<String>,
+}
+
+/** The Docker configuration file */
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+pub struct Dockerfile {
+    pub docker: std::path::PathBuf,
+}
diff --git a/src/dev.rs b/src/dev.rs
deleted file mode 100644
index 745d3b1..0000000
--- a/src/dev.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-pub use clap::Args;
-
-use crate::cli::CliSubcommand;
-use crate::config::DEFAULT_CONFIG_FILE;
-
-#[derive(Args)]
-pub struct Dev {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-}
-
-impl CliSubcommand for Dev {
-    fn run(&self) {
-        todo!()
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index c26fbe0..030563a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,19 +3,17 @@
 //! The Lenra's command line interface
 
 use clap::Parser;
-use cli::{Cli, CliSubcommand};
+use cli::{Cli, CliCommand};
 use env_logger;
 
 mod build;
 mod cli;
 mod config;
-mod dev;
 mod new;
 mod start;
 
 fn main() {
     env_logger::init();
     let args = Cli::parse();
-    // TODO: manage config file
     args.command.run();
 }
diff --git a/src/new.rs b/src/new.rs
index 1e29cab..3a7aacc 100644
--- a/src/new.rs
+++ b/src/new.rs
@@ -9,7 +9,7 @@ use regex::Regex;
 use std::fs;
 use std::process::Command;
 
-use crate::cli::CliSubcommand;
+use crate::cli::CliCommand;
 
 #[derive(Args)]
 pub struct New {
@@ -29,7 +29,7 @@ lazy_static! {
         Regex::new(r"^(template-)?([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
 }
 
-impl CliSubcommand for New {
+impl CliCommand for New {
     fn run(&self) {
         if self.path.exists() {
             panic!("The path '{}' already exists", self.path.display())
diff --git a/src/start.rs b/src/start.rs
index dfe0c8f..6626f53 100644
--- a/src/start.rs
+++ b/src/start.rs
@@ -1,6 +1,6 @@
 pub use clap::Args;
 
-use crate::cli::CliSubcommand;
+use crate::cli::CliCommand;
 use crate::config::DEFAULT_CONFIG_FILE;
 
 #[derive(Args)]
@@ -10,7 +10,7 @@ pub struct Start {
     pub config: std::path::PathBuf,
 }
 
-impl CliSubcommand for Start {
+impl CliCommand for Start {
     fn run(&self) {
         todo!()
     }

From 7cf853fd85dafabbcb8faede56980115dde02bf3 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Mon, 5 Sep 2022 17:57:07 +0200
Subject: [PATCH 07/76] ci: Configure the GitHub Actions (#6)

---
 .github/ISSUE_TEMPLATE/bug_report.yml |  42 +++++
 .github/ISSUE_TEMPLATE/config.yml     |   6 +
 .github/ISSUE_TEMPLATE/task.md        |  26 +++
 .github/workflows/build_ci.yml        | 222 ++++++++++++++++++++++++++
 .releaserc.yml                        |  15 ++
 5 files changed, 311 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/task.md
 create mode 100644 .github/workflows/build_ci.yml
 create mode 100644 .releaserc.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..b2de2f8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,42 @@
+name: Bug Report
+description: Send a bug report
+title: "[Bug]: "
+labels: ["bug", "triage"]
+assignees:
+  - Nesqwik
+  - taorepoara
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: Shell
+  # - type: checkboxes
+  #   id: terms
+  #   attributes:
+  #     label: Code of Conduct
+  #     description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
+  #     options:
+  #       - label: I agree to follow this project's Code of Conduct
+  #         required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..f6ce4ed
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+
+blank_issues_enabled: true
+contact_links:
+  - name: Feature request
+    url: https://github.com/lenra-io/Lenra/discussions/categories/ideas
+    about: Please send your feature request in the discussion tab !
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
new file mode 100644
index 0000000..9d60646
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.md
@@ -0,0 +1,26 @@
+---
+name: Task
+about: Create a new task. Technical task should be small enough to be done by only
+  one person in a reasonable time.
+title: "[Task] "
+labels: enhancement
+assignees: ''
+
+---
+
+## What should be done 
+Describe the task and scope...
+
+## Technical recommandation
+Any technical recommandation or specific warning about this task (if needed)
+- Security issue to be warned of 
+- Complexity issue
+
+## Ecological concerns
+What can be done to improve the ecological impact of this task ?
+- Can we minimize the data sent to the network ? 
+- Are data stored ? Can we minimize the amount of stored data ?
+- Is it CPU-intensive ? Can we reduce the CPU charge ?
+- Is it RAM-intensive ? Can we reduce the RAM load ?
+
+## Is this task linked with any other ?
diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
new file mode 100644
index 0000000..b5e6dc7
--- /dev/null
+++ b/.github/workflows/build_ci.yml
@@ -0,0 +1,222 @@
+name: Rust
+
+on:
+  push:
+    branches:
+      - main
+      - beta
+    paths-ignore:
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - '*.md'
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  get-next-version:
+    name: Get next version
+    runs-on: ubuntu-20.04
+    continue-on-error: true # must be allow to fail
+    timeout-minutes: 2
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
+
+    - id: get-next-version
+      name: Get next version
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: npx -p conventional-changelog-conventionalcommits@5 -p @semantic-release/git -p semantic-release-export-data -p semantic-release@19 semantic-release --dry-run
+
+    outputs:
+      new-release-published: ${{ steps.get-next-version.outputs.new-release-published }}
+      new-release-version: ${{ steps.get-next-version.outputs.new-release-version }}
+
+  style:
+    name: Check Style
+    runs-on: ubuntu-20.04
+    timeout-minutes: 2
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        components: rustfmt
+        profile: minimal
+        override: true
+
+    - name: cargo fmt -- --check
+      uses: actions-rs/cargo@v1
+      with:
+        command: fmt
+        args: --all -- --check
+
+  test:
+    name: Test
+    needs: [style]
+    runs-on: ubuntu-20.04
+    timeout-minutes: 5
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Install rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+
+    - name: Build debug
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: --verbose
+
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --verbose
+
+  build:
+    name: Build ${{ matrix.os }} ${{ matrix.arch }}
+    needs: [test, get-next-version]
+    runs-on: "${{ matrix.runner }}"
+    env:
+      VERSION: ${{ needs.get-next-version.outputs.new-release-version }}
+    timeout-minutes: 20
+    strategy:
+      matrix: # Need to find what's the best target for `x86-x64-linux` and remove the others (gnu or musl)
+        include:
+        - target: aarch64-unknown-linux-musl
+          os: linux
+          arch: aarch64
+          runner: ubuntu-20.04
+        - target: x86_64-unknown-linux-musl
+          os: linux
+          arch: x86_64
+          runner: ubuntu-20.04
+        - target: x86_64-pc-windows-msvc
+          os: windows
+          arch: x86_64
+          runner: windows-2022
+          file_extension: '.exe'
+        - target: aarch64-pc-windows-msvc
+          os: windows
+          arch: aarch64
+          runner: windows-2022
+          file_extension: '.exe'
+        - target: x86_64-apple-darwin
+          os: macos
+          arch: x86_64
+          runner: macos-11
+        - target: aarch64-apple-darwin
+          os: macos
+          arch: aarch64
+          runner: macos-11
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        target: ${{ matrix.target }}
+
+    - name: Install cargo-edit
+      uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: cargo-edit
+
+    - name: Set version
+      uses: actions-rs/cargo@v1
+      with:
+        command: set-version
+        args: ${{ env.VERSION }}
+
+    - name: Build target
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: true
+        command: build
+        args: --release --target ${{ matrix.target }}
+
+    - name: Zip
+      if: ${{ matrix.os == 'windows' }}
+      shell: pwsh
+      run: Compress-Archive "target/${{ matrix.target }}/release/lenra${{ matrix.file_extension }}" "lenra-${{ matrix.os }}-${{ matrix.arch }}.zip"
+    - name: Zip
+      if: ${{ matrix.os != 'windows' }}
+      shell: bash
+      run: tar -czf "lenra-${{ matrix.os }}-${{ matrix.arch }}.tar.gz" "target/${{ matrix.target }}/release/lenra${{ matrix.file_extension }}"
+
+    - name: Upload
+      uses: actions/upload-artifact@v3
+      with:
+        name: lenra-${{ matrix.os }}-${{ matrix.arch }}
+        path: lenra-${{ matrix.os }}-${{ matrix.arch }}.*
+
+
+  publish:
+    name: publish
+    needs: [build, get-next-version]
+    if: github.ref_name == 'main' || github.ref_name == 'beta'
+    runs-on: ubuntu-latest
+    env:
+      VERSION: ${{ needs.get-next-version.outputs.new-release-version }}
+    timeout-minutes: 8
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: download-artifacts
+      uses: actions/download-artifact@v3
+      with:
+        path: artifacts/
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: "16"
+
+    - id: release
+      name: Release
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: npx -p conventional-changelog-conventionalcommits@5 -p @semantic-release/git -p semantic-release-export-data -p semantic-release@19 semantic-release
+
+    - name: Install cargo-edit
+      if: ${{ steps.release.outputs.new-release-published }}
+      uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: cargo-edit
+
+    - name: Set version
+      if: ${{ steps.release.outputs.new-release-published }}
+      uses: actions-rs/cargo@v1
+      with:
+        command: set-version
+        args: ${{ env.VERSION }}
+
+    - name: Publish cargo
+      shell: bash
+      if: ${{ steps.release.outputs.new-release-published }}
+      run: cargo publish --allow-dirty --token "${{ secrets.CARGO_TOKEN }}"
diff --git a/.releaserc.yml b/.releaserc.yml
new file mode 100644
index 0000000..21f18d4
--- /dev/null
+++ b/.releaserc.yml
@@ -0,0 +1,15 @@
+---
+branches:
+  - "+([0-9])?(.{+([0-9]),x}).x"
+  - main
+  - name: beta
+    prerelease: true
+plugins:
+  - - "@semantic-release/commit-analyzer"
+    - preset: conventionalcommits
+  - - "@semantic-release/release-notes-generator"
+    - preset: conventionalcommits
+  - - "@semantic-release/github"
+    - assets:
+      - path: artifacts/*/*
+  - - "semantic-release-export-data"

From ba02afab0b45664261b67737f619905c6cb63b64 Mon Sep 17 00:00:00 2001
From: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com>
Date: Wed, 7 Sep 2022 08:45:02 +0200
Subject: [PATCH 08/76] feat: Start/stop commands (#5)

Co-authored-by: Thomas DA ROCHA <thomas.darocha@lenra.io>
Co-authored-by: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
---
 Cargo.lock                 | 140 +++++++++++++++++++-
 Cargo.toml                 |   9 +-
 README.md                  |  60 +++++++--
 src/build.rs               | 264 -------------------------------------
 src/cli/build.rs           |  37 ++++++
 src/{cli.rs => cli/mod.rs} |  12 +-
 src/{ => cli}/new.rs       |   0
 src/cli/start.rs           |  48 +++++++
 src/cli/stop.rs            |  51 +++++++
 src/config.rs              | 243 +++++++++++++++++++++++++++++++++-
 src/docker_compose.rs      | 225 +++++++++++++++++++++++++++++++
 src/main.rs                |   4 +-
 src/start.rs               |  17 ---
 13 files changed, 808 insertions(+), 302 deletions(-)
 delete mode 100644 src/build.rs
 create mode 100644 src/cli/build.rs
 rename src/{cli.rs => cli/mod.rs} (72%)
 rename src/{ => cli}/new.rs (100%)
 create mode 100644 src/cli/start.rs
 create mode 100644 src/cli/stop.rs
 create mode 100644 src/docker_compose.rs
 delete mode 100644 src/start.rs

diff --git a/Cargo.lock b/Cargo.lock
index 4bf7809..3c3162f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,6 +79,84 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "darling"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
+dependencies = [
+ "derive_builder_core",
+ "syn",
+]
+
+[[package]]
+name = "docker-compose-types"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7213b15aa1b9e80b202b9e8c95dd0e2df45805dba8301dda2f72549436be67"
+dependencies = [
+ "derive_builder",
+ "indexmap",
+ "serde",
+ "serde_yaml 0.8.26",
+]
+
 [[package]]
 name = "dofigen"
 version = "1.0.0"
@@ -88,7 +166,7 @@ dependencies = [
  "clap",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.9.9",
  "thiserror",
 ]
 
@@ -105,6 +183,12 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -132,6 +216,12 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "indexmap"
 version = "1.9.1"
@@ -140,6 +230,7 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
 dependencies = [
  "autocfg",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -159,14 +250,16 @@ name = "lenra_cli"
 version = "0.0.0"
 dependencies = [
  "clap",
+ "docker-compose-types",
  "dofigen",
  "env_logger",
  "lazy_static",
  "log",
+ "open",
  "regex",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.9.9",
 ]
 
 [[package]]
@@ -175,6 +268,12 @@ version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -196,12 +295,28 @@ version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
 
+[[package]]
+name = "open"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcea7a30d6b81a2423cc59c43554880feff7b57d12916f231a79f8d6d9470201"
+dependencies = [
+ "pathdiff",
+ "winapi",
+]
+
 [[package]]
 name = "os_str_bytes"
 version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
 
+[[package]]
+name = "pathdiff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -298,6 +413,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.9.9"
@@ -411,3 +538,12 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 6b64d92..cd8f03f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,11 +3,16 @@ name = "lenra_cli"
 version = "0.0.0"
 edition = "2021"
 license = "MIT"
-description = "THe Lenra's command line interface"
+description = "The Lenra command line interface"
 readme = "../README.md"
 repository = "https://github.com/lenra-io/lenra_cli"
 keywords = ["cli", "lenra"]
 categories = ["command-line-utilities"]
+include = [
+    "**/*.rs",
+    "Cargo.toml",
+    "README.md",
+]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,3 +31,5 @@ env_logger = "0.9.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
 dofigen = "1"
+docker-compose-types = "0.2.1"
+open = "1"
diff --git a/README.md b/README.md
index 0242657..1d0d309 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,15 @@ The Lenra's command line interface.
 
 ### Prerequisites
 
-Install the Lenra's cli using one of the next possibilities.
+To build and run the Lenra elements that handle your app, the Lenra CLI needs [Docker](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/).
+
+You can also install the [Docker buildx command](https://docs.docker.com/build/buildx/install/) to use the [Buildkit optimization given by Dofigen](https://github.com/lenra-io/dofigen).
+
+Install the Lenra CLI using one of the next possibilities.
+
+#### Download the binary
+
+You can download the binary from [the release page](https://github.com/lenra-io/lenra_cli/releases) and add it to your path environment variable.
 
 #### Cargo install
 
@@ -48,16 +56,15 @@ Then use the next command to install the Lenra's cli:
 cargo install lenra_cli
 ```
 
-#### Download the binary
-
-You can download the binary from [the release page](https://github.com/lenra-io/lenra_cli/releases) and add it to your path environment variable.
+#### Build it from sources
 
-#### Use it with Docker
+First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
 
-You can run cli directly from it Docker image with the next command:
+Then clone this repository and install it with Cargo:
 
 ```bash
-docker run --rm -it -v $(pwd):/app lenra/cli
+git clone https://github.com/lenra-io/lenra_cli.git
+cargo install --path .
 ```
 
 <p align="right">(<a href="#top">back to top</a>)</p>
@@ -69,7 +76,7 @@ Use the help options to understand how to use it:
 ```bash
 $ lenra --help
 lenra_cli 0.0.0
-A Dockerfile generator using a simplified description in YAML or JSON format command line tool
+The Lenra command line interface
 
 USAGE:
     lenra <SUBCOMMAND>
@@ -83,6 +90,7 @@ SUBCOMMANDS:
     help     Print this message or the help of the given subcommand(s)
     new      Create a new Lenra app project
     start    Start your app previously built with the build command
+    stop     Stop your app previously started with the start command
 ```
 
 ### Subcommands
@@ -91,6 +99,8 @@ This tools contains many subcommands to help you doing what you need.
 
 - [new](#new): creates a new Lenra app project
 - [build](#build): builds the Lenra app of the current directory
+- [start](#start): starts your app previously built with the build command
+- [stop](#stop): stops your app previously started with the start command
 
 #### new
 
@@ -136,6 +146,40 @@ OPTIONS:
     -h, --help               Print help information
 ```
 
+#### start
+
+This subcommand starts the Lenra app of the current directory previously built.
+
+```bash
+$ lenra start --help
+lenra-start 
+Start your app previously built with the build command
+
+USAGE:
+    lenra start [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
+
+#### stop
+
+This subcommand stops the Lenra app of the current directory and removes the Docker Compose elements.
+
+```bash
+$ lenra stop --help
+lenra-stop 
+Stop your app previously started with the start command
+
+USAGE:
+    lenra stop [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
+
 ### Configuration file
 
 The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
diff --git a/src/build.rs b/src/build.rs
deleted file mode 100644
index a8b0f50..0000000
--- a/src/build.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-use log;
-use std::collections::HashMap;
-use std::fs;
-use std::path::PathBuf;
-use std::process::{Command, Stdio};
-
-use clap;
-use dofigen_lib::{
-    from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder, Image,
-};
-
-use crate::cli::CliCommand;
-use crate::config::{load_config_file, Generator, DEFAULT_CONFIG_FILE, LENRA_CACHE_DIRECTORY};
-
-static OF_WATCHDOG_BUILDER: &str = "of-watchdog";
-static OF_WATCHDOG_IMAGE: &str = "ghcr.io/openfaas/of-watchdog";
-static OF_WATCHDOG_VERSION: &str = "0.9.6";
-
-#[derive(clap::Args)]
-pub struct Build {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-
-    /// The app configuration file.
-    #[clap(value_enum, long, default_value = "local")]
-    pub cache: Cache,
-}
-
-#[derive(clap::ValueEnum, Clone, Debug)]
-pub enum Cache {
-    Local,
-    Inline,
-    Image,
-    No,
-}
-
-impl Build {
-    /// Builds a Docker image from a Dofigen structure
-    fn build_dofigen(&self, image: Image) {
-        // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
-        let of_overlay = self.dofigen_of_overlay(image);
-
-        // generate the Dockerfile and .dockerignore files with Dofigen
-        let dockerfile = generate_dockerfile(&of_overlay);
-        let dockerignore = generate_dockerignore(&of_overlay);
-        self.save_docker_content(dockerfile, Some(dockerignore));
-
-        // build the generated Dockerfile
-        self.build_docker_image(None);
-    }
-
-    /// Add an overlay to the given Dofigen structure to manage OpenFaaS
-    fn dofigen_of_overlay(&self, image: Image) -> Image {
-        log::info!("Adding OpenFaaS overlay to the Dofigen descriptor");
-        let mut builders = if let Some(vec) = image.builders {
-            vec
-        } else {
-            Vec::new()
-        };
-        builders.push(Builder {
-            name: Some(String::from(OF_WATCHDOG_BUILDER)),
-            image: format!("{}:{}", OF_WATCHDOG_IMAGE, OF_WATCHDOG_VERSION),
-            ..Default::default()
-        });
-
-        let mut artifacts = if let Some(arts) = image.artifacts {
-            arts
-        } else {
-            Vec::new()
-        };
-        artifacts.push(Artifact {
-            builder: OF_WATCHDOG_BUILDER.to_string(),
-            source: "/fwatchdog".to_string(),
-            destination: "/fwatchdog".to_string(),
-        });
-
-        let mut envs = if let Some(envs) = image.envs {
-            envs
-        } else {
-            HashMap::new()
-        };
-
-        if let Some(ports) = image.ports {
-            if ports.len() == 1 {
-                envs.insert("mode".to_string(), "http".to_string());
-                envs.insert(
-                    "upstream_url".to_string(),
-                    format!("http://127.0.0.1:{}", ports[0]),
-                );
-            } else if ports.len() > 1 {
-                panic!("More than one port has been defined in the Dofigen descriptor");
-            }
-        };
-
-        if image.entrypoint.is_some() {
-            panic!("The Dofigen descriptor can't have entrypoint defined. Use cmd instead");
-        }
-
-        if let Some(cmd) = image.cmd {
-            envs.insert("fprocess".to_string(), cmd.join(" "));
-        } else {
-            panic!("The Dofigen cmd property is not defined");
-        }
-
-        Image {
-            image: image.image,
-            builders: Some(builders),
-            artifacts: Some(artifacts),
-            ports: Some(vec![8080]),
-            envs: Some(envs),
-            entrypoint: None,
-            cmd: Some(vec!["/fwatchdog".to_string()]),
-            user: image.user,
-            workdir: image.workdir,
-            adds: image.adds,
-            root: image.root,
-            script: image.script,
-            caches: image.caches,
-            healthcheck: image.healthcheck,
-            ignores: image.ignores,
-        }
-    }
-
-    /// Saves the Dockerfile and dockerignore (if present) files from their contents
-    fn save_docker_content(
-        &self,
-        dockerfile_content: String,
-        dockerignore_content: Option<String>,
-    ) {
-        let dockerfile_path: PathBuf = [LENRA_CACHE_DIRECTORY, "Dockerfile"].iter().collect();
-        let dockerignore_path: PathBuf = [LENRA_CACHE_DIRECTORY, ".dockerignore"].iter().collect();
-
-        fs::write(dockerfile_path, dockerfile_content).expect("Unable to write the Dockerfile");
-        if let Some(content) = dockerignore_content {
-            fs::write(dockerignore_path, content).expect("Unable to write the .dockerignore file");
-        }
-    }
-
-    /// Builds a Dockerfile. If None, get's it at the default path: ./.lenra/Dockerfile
-    fn build_docker_image(&self, dockerfile: Option<PathBuf>) {
-        log::info!("Build the Docker image");
-        let dockerfile_path: PathBuf =
-            dockerfile.unwrap_or([LENRA_CACHE_DIRECTORY, "Dockerfile"].iter().collect());
-        let cache_directory: PathBuf = [LENRA_CACHE_DIRECTORY, "dockercache"].iter().collect();
-        let mut command = Command::new("docker");
-        let image_name = "lenra/app";
-
-        // TODO: display std out & err
-        command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
-        command
-            .arg("buildx")
-            .arg("build")
-            .arg("-f")
-            .arg(dockerfile_path);
-
-        match self.cache {
-            Cache::Inline => command
-                .arg("--cache-to=type=inline")
-                .arg(format!("--cache-from={}", image_name)),
-            Cache::Local => command
-                .arg(format!(
-                    "--cache-to=type=local,dest={}",
-                    cache_directory.display()
-                ))
-                .arg(format!(
-                    "--cache-from=type=local,src={}",
-                    cache_directory.display()
-                )),
-            Cache::Image => command
-                .arg(format!("--cache-to={}:cache", image_name))
-                .arg(format!("--cache-from={}:cache", image_name)),
-            Cache::No => &command,
-        };
-        command.arg("-t").arg(image_name).arg("--load").arg(".");
-
-        log::debug!("Build image: {:?}", command);
-        let output = command.output().expect("Failed building the Docker image");
-        if !output.status.success() {
-            panic!(
-                "An error occured while building the Docker image:\n{}\n{}",
-                String::from_utf8(output.stdout).unwrap(),
-                String::from_utf8(output.stderr).unwrap()
-            )
-        }
-        log::info!("Image built");
-    }
-}
-
-impl CliCommand for Build {
-    fn run(&self) {
-        let conf = load_config_file(&self.config);
-        // TODO: check the components API version
-
-        // create the `.lenra` cache directory
-        fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
-
-        match conf.generator {
-            Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen),
-            Generator::DofigenFile(dofigen_file) => self.build_dofigen(
-                from_file_path(&dofigen_file.dofigen).expect("Failed loading the Dofigen file"),
-            ),
-            Generator::DofigenError { dofigen: _ } => {
-                panic!("Your Dofigen configuration is not correct")
-            }
-            Generator::Dockerfile(dockerfile) => self.build_docker_image(Some(dockerfile.docker)),
-            Generator::Docker(docker) => {
-                self.save_docker_content(docker.docker, docker.ignore);
-                self.build_docker_image(None);
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod dofigen_of_overlay_tests {
-    use super::*;
-
-    #[test]
-    fn simple_image() {
-        let build = Build {
-            config: DEFAULT_CONFIG_FILE.into(),
-            cache: Cache::Inline,
-        };
-        let image = Image {
-            image: "my-dockerimage".into(),
-            cmd: Some(vec!["/app/my-app".into()]),
-            ..Default::default()
-        };
-        let overlayed_image = Image {
-            builders: Some(vec![Builder {
-                name: Some("of-watchdog".into()),
-                image: format!("ghcr.io/openfaas/of-watchdog:{}", OF_WATCHDOG_VERSION),
-                ..Default::default()
-            }]),
-            image: String::from("my-dockerimage"),
-            envs: Some([("fprocess".to_string(), "/app/my-app".to_string())].into()),
-            artifacts: Some(vec![Artifact {
-                builder: "of-watchdog".into(),
-                source: "/fwatchdog".into(),
-                destination: "/fwatchdog".into(),
-            }]),
-            ports: Some(vec![8080]),
-            cmd: Some(vec!["/fwatchdog".into()]),
-            ..Default::default()
-        };
-
-        assert_eq!(build.dofigen_of_overlay(image), overlayed_image);
-    }
-
-    #[test]
-    #[should_panic]
-    fn no_cmd() {
-        let build = Build {
-            config: DEFAULT_CONFIG_FILE.into(),
-            cache: Cache::Inline,
-        };
-        let image = Image {
-            image: "my-dockerimage".into(),
-            ..Default::default()
-        };
-        build.dofigen_of_overlay(image);
-    }
-}
diff --git a/src/cli/build.rs b/src/cli/build.rs
new file mode 100644
index 0000000..89a3849
--- /dev/null
+++ b/src/cli/build.rs
@@ -0,0 +1,37 @@
+use log;
+
+use clap;
+
+use crate::cli::CliCommand;
+use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
+use crate::docker_compose::compose_build;
+
+#[derive(clap::Args)]
+pub struct Build {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+}
+
+impl Build {
+    /// Builds a Dockerfile. If None, get's it at the default path: ./.lenra/Dockerfile
+    fn build_docker_compose(&self) {
+        log::info!("Build the Docker image");
+
+        compose_build();
+
+        log::info!("Image built");
+    }
+}
+
+impl CliCommand for Build {
+    fn run(&self) {
+        let conf = load_config_file(&self.config);
+        // TODO: check the components API version
+
+        conf.generate_files();
+
+        // self.build_docker_image(conf);
+        self.build_docker_compose();
+    }
+}
diff --git a/src/cli.rs b/src/cli/mod.rs
similarity index 72%
rename from src/cli.rs
rename to src/cli/mod.rs
index c2b94ef..017c76d 100644
--- a/src/cli.rs
+++ b/src/cli/mod.rs
@@ -1,8 +1,13 @@
 pub use clap::{Args, Parser, Subcommand};
 
-use crate::{build::Build, new::New, start::Start};
+use self::{build::Build, new::New, start::Start, stop::Stop};
 
-/// The Lenra CLI arguments to manage your local app development.
+mod build;
+mod new;
+mod start;
+mod stop;
+
+/// The Lenra command line interface
 #[derive(Parser)]
 #[clap(author, version, about, long_about = None)]
 pub struct Cli {
@@ -23,6 +28,8 @@ pub enum Command {
     Build(Build),
     /// Start your app previously built with the build command
     Start(Start),
+    /// Stop your app previously started with the start command
+    Stop(Stop),
 }
 
 impl CliCommand for Command {
@@ -31,6 +38,7 @@ impl CliCommand for Command {
             Command::New(new) => new.run(),
             Command::Build(build) => build.run(),
             Command::Start(start) => start.run(),
+            Command::Stop(stop) => stop.run(),
         };
     }
 }
diff --git a/src/new.rs b/src/cli/new.rs
similarity index 100%
rename from src/new.rs
rename to src/cli/new.rs
diff --git a/src/cli/start.rs b/src/cli/start.rs
new file mode 100644
index 0000000..eee821c
--- /dev/null
+++ b/src/cli/start.rs
@@ -0,0 +1,48 @@
+use std::path::PathBuf;
+
+pub use clap::Args;
+
+use crate::cli::CliCommand;
+use crate::config::{load_config_file, DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
+use crate::docker_compose::{compose_up, execute_compose_service_command, DEVTOOL_SERVICE_NAME};
+
+#[derive(Args)]
+pub struct Start {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+}
+
+impl Start {
+    /// Starts the docker-compose
+    fn start_docker_compose(&self) {
+        let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+        if !dockercompose_path.exists() {
+            let conf = load_config_file(&self.config);
+            // TODO: check the components API version
+
+            conf.generate_files();
+        }
+
+        // Start the containers
+        compose_up();
+        // Stop the devtool app env to reset cache
+        execute_compose_service_command(
+            DEVTOOL_SERVICE_NAME,
+            &[
+                "bin/dev_tools",
+                "rpc",
+                "ApplicationRunner.Environments.Managers.stop_env(1)",
+            ],
+        );
+        // Open the app
+        open::that("http://localhost:4000").unwrap();
+    }
+}
+
+impl CliCommand for Start {
+    fn run(&self) {
+        log::info!("Starting the app");
+        self.start_docker_compose();
+    }
+}
diff --git a/src/cli/stop.rs b/src/cli/stop.rs
new file mode 100644
index 0000000..67f4b60
--- /dev/null
+++ b/src/cli/stop.rs
@@ -0,0 +1,51 @@
+use std::path::PathBuf;
+use std::process::{Command, Stdio};
+
+pub use clap::Args;
+
+use crate::cli::CliCommand;
+use crate::config::{DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
+
+#[derive(Args)]
+pub struct Stop {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+}
+
+impl Stop {
+    /// Starts the docker-compose
+    fn stop_docker_compose(&self) {
+        let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+        if !dockercompose_path.exists() {}
+
+        let mut command = Command::new("docker");
+
+        // TODO: display std out & err
+        command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
+        command
+            .arg("compose")
+            .arg("-f")
+            .arg(dockercompose_path)
+            .arg("down");
+
+        log::debug!("cmd: {:?}", command);
+        let output = command
+            .output()
+            .expect("Failed to stop the docker-compose app");
+        if !output.status.success() {
+            panic!(
+                "An error occured while stoping the docker-compose app:\n{}\n{}",
+                String::from_utf8(output.stdout).unwrap(),
+                String::from_utf8(output.stderr).unwrap()
+            )
+        }
+    }
+}
+
+impl CliCommand for Stop {
+    fn run(&self) {
+        log::info!("Stoping the app");
+        self.stop_docker_compose();
+    }
+}
diff --git a/src/config.rs b/src/config.rs
index 72d5526..74d5334 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,11 +1,25 @@
-use std::fs;
+use std::{collections::HashMap, fs, path::PathBuf};
 
-use dofigen_lib::Image;
+use dofigen_lib::{
+    from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder, Image,
+};
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 
-pub static DEFAULT_CONFIG_FILE: &str = "lenra.yml";
-pub static LENRA_CACHE_DIRECTORY: &str = ".lenra";
+use crate::docker_compose::generate_docker_compose;
+
+pub const DEFAULT_CONFIG_FILE: &str = "lenra.yml";
+pub const LENRA_CACHE_DIRECTORY: &str = ".lenra";
+
+pub const DEVTOOL_DEFAULT_TAG: &str = "beta";
+
+pub const DOCKERFILE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "Dockerfile"];
+pub const DOCKERIGNORE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "Dockerfile.dockerignore"];
+pub const DOCKERCOMPOSE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "docker-compose.yml"];
+
+pub const OF_WATCHDOG_BUILDER: &str = "of-watchdog";
+pub const OF_WATCHDOG_IMAGE: &str = "ghcr.io/openfaas/of-watchdog";
+pub const OF_WATCHDOG_VERSION: &str = "0.9.6";
 
 pub fn load_config_file(path: &std::path::PathBuf) -> Application {
     let file = fs::File::open(path).unwrap();
@@ -21,11 +35,21 @@ pub fn load_config_file(path: &std::path::PathBuf) -> Application {
 }
 
 /** The main component of the config file */
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[serde(rename_all = "camelCase")]
 pub struct Application {
     #[serde(rename = "componentsApi")]
     pub components_api: String,
     pub generator: Generator,
+    pub dev: Option<Dev>,
+}
+
+/** The dev specific configuration */
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct Dev {
+    #[serde(default = "devtool_default_tag")]
+    pub devtool_tag: String,
 }
 
 /** The application generator configuration */
@@ -37,6 +61,7 @@ pub enum Generator {
     DofigenError { dofigen: Value },
     Dockerfile(Dockerfile),
     Docker(Docker),
+    Unknow,
 }
 
 /** The Dofigen configuration */
@@ -63,3 +88,211 @@ pub struct Docker {
 pub struct Dockerfile {
     pub docker: std::path::PathBuf,
 }
+
+impl Application {
+    /// Generates all the files needed to build and run the application
+    pub fn generate_files(&self) {
+        self.generate_docker_files();
+        self.generate_docker_compose_file();
+    }
+
+    pub fn generate_docker_files(&self) {
+        log::info!("Docker files generation");
+        // create the `.lenra` cache directory
+        fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
+
+        match &self.generator {
+            Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen.clone()),
+            Generator::DofigenFile(dofigen_file) => self.build_dofigen(
+                from_file_path(&dofigen_file.dofigen).expect("Failed loading the Dofigen file"),
+            ),
+            Generator::DofigenError { dofigen: _ } => {
+                panic!("Your Dofigen configuration is not correct")
+            }
+            Generator::Dockerfile(_dockerfile) => (),
+            Generator::Docker(docker) => {
+                self.save_docker_content(docker.docker.clone(), docker.ignore.clone());
+            }
+            Generator::Unknow => panic!("Not managed generator"),
+        }
+    }
+
+    pub fn generate_docker_compose_file(&self) {
+        log::info!("Docker Compose file generation");
+        // create the `.lenra` cache directory
+        fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
+
+        let dockerfile: PathBuf = if let Generator::Dockerfile(file_conf) = &self.generator {
+            file_conf.docker.clone()
+        } else {
+            DOCKERFILE_DEFAULT_PATH.iter().collect()
+        };
+
+        generate_docker_compose(dockerfile, &self.dev);
+    }
+
+    /// Builds a Docker image from a Dofigen structure
+    fn build_dofigen(&self, image: Image) {
+        // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
+        let of_overlay = self.dofigen_of_overlay(image);
+
+        // generate the Dockerfile and .dockerignore files with Dofigen
+        let dockerfile = generate_dockerfile(&of_overlay);
+        let dockerignore = generate_dockerignore(&of_overlay);
+        self.save_docker_content(dockerfile, Some(dockerignore));
+    }
+
+    /// Add an overlay to the given Dofigen structure to manage OpenFaaS
+    fn dofigen_of_overlay(&self, image: Image) -> Image {
+        log::info!("Adding OpenFaaS overlay to the Dofigen descriptor");
+        let mut builders = if let Some(vec) = image.builders {
+            vec
+        } else {
+            Vec::new()
+        };
+        builders.push(Builder {
+            name: Some(String::from(OF_WATCHDOG_BUILDER)),
+            image: format!("{}:{}", OF_WATCHDOG_IMAGE, OF_WATCHDOG_VERSION),
+            ..Default::default()
+        });
+
+        let mut artifacts = if let Some(arts) = image.artifacts {
+            arts
+        } else {
+            Vec::new()
+        };
+        artifacts.push(Artifact {
+            builder: OF_WATCHDOG_BUILDER.to_string(),
+            source: "/fwatchdog".to_string(),
+            destination: "/fwatchdog".to_string(),
+        });
+
+        let mut envs = if let Some(envs) = image.envs {
+            envs
+        } else {
+            HashMap::new()
+        };
+
+        if let Some(ports) = image.ports {
+            if ports.len() == 1 {
+                envs.insert("mode".to_string(), "http".to_string());
+                envs.insert(
+                    "upstream_url".to_string(),
+                    format!("http://127.0.0.1:{}", ports[0]),
+                );
+            } else if ports.len() > 1 {
+                panic!("More than one port has been defined in the Dofigen descriptor");
+            }
+        };
+
+        if image.entrypoint.is_some() {
+            panic!("The Dofigen descriptor can't have entrypoint defined. Use cmd instead");
+        }
+
+        if let Some(cmd) = image.cmd {
+            envs.insert("fprocess".to_string(), cmd.join(" "));
+        } else {
+            panic!("The Dofigen cmd property is not defined");
+        }
+
+        Image {
+            image: image.image,
+            builders: Some(builders),
+            artifacts: Some(artifacts),
+            ports: Some(vec![8080]),
+            envs: Some(envs),
+            entrypoint: None,
+            cmd: Some(vec!["/fwatchdog".to_string()]),
+            user: image.user,
+            workdir: image.workdir,
+            adds: image.adds,
+            root: image.root,
+            script: image.script,
+            caches: image.caches,
+            healthcheck: image.healthcheck,
+            ignores: image.ignores,
+        }
+    }
+
+    /// Saves the Dockerfile and dockerignore (if present) files from their contents
+    fn save_docker_content(
+        &self,
+        dockerfile_content: String,
+        dockerignore_content: Option<String>,
+    ) {
+        let dockerfile_path: PathBuf = DOCKERFILE_DEFAULT_PATH.iter().collect();
+        let dockerignore_path: PathBuf = DOCKERIGNORE_DEFAULT_PATH.iter().collect();
+
+        fs::write(dockerfile_path, dockerfile_content).expect("Unable to write the Dockerfile");
+        if let Some(content) = dockerignore_content {
+            fs::write(dockerignore_path, content).expect("Unable to write the .dockerignore file");
+        }
+    }
+}
+
+fn devtool_default_tag() -> String {
+    DEVTOOL_DEFAULT_TAG.to_string()
+}
+
+impl Default for Generator {
+    fn default() -> Self {
+        Generator::Unknow
+    }
+}
+
+#[cfg(test)]
+mod dofigen_of_overlay_tests {
+    use super::*;
+
+    #[test]
+    fn simple_image() {
+        let image = Image {
+            image: "my-dockerimage".into(),
+            cmd: Some(vec!["/app/my-app".into()]),
+            ..Default::default()
+        };
+        let overlayed_image = Image {
+            builders: Some(vec![Builder {
+                name: Some("of-watchdog".into()),
+                image: format!("ghcr.io/openfaas/of-watchdog:{}", OF_WATCHDOG_VERSION),
+                ..Default::default()
+            }]),
+            image: String::from("my-dockerimage"),
+            envs: Some([("fprocess".to_string(), "/app/my-app".to_string())].into()),
+            artifacts: Some(vec![Artifact {
+                builder: "of-watchdog".into(),
+                source: "/fwatchdog".into(),
+                destination: "/fwatchdog".into(),
+            }]),
+            ports: Some(vec![8080]),
+            cmd: Some(vec!["/fwatchdog".into()]),
+            ..Default::default()
+        };
+        let config = Application {
+            components_api: "".to_string(),
+            generator: Generator::Dofigen(Dofigen {
+                dofigen: image.clone(),
+            }),
+            ..Default::default()
+        };
+
+        assert_eq!(config.dofigen_of_overlay(image), overlayed_image);
+    }
+
+    #[test]
+    #[should_panic]
+    fn no_cmd() {
+        let image = Image {
+            image: "my-dockerimage".into(),
+            ..Default::default()
+        };
+        let config = Application {
+            components_api: "".to_string(),
+            generator: Generator::Dofigen(Dofigen {
+                dofigen: image.clone(),
+            }),
+            ..Default::default()
+        };
+        config.dofigen_of_overlay(image);
+    }
+}
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
new file mode 100644
index 0000000..d048f9e
--- /dev/null
+++ b/src/docker_compose.rs
@@ -0,0 +1,225 @@
+use std::{
+    fs,
+    path::PathBuf,
+    process::{Command, Stdio},
+};
+
+use docker_compose_types::{
+    AdvancedBuildStep, BuildStep, Compose, DependsCondition, DependsOnOptions, Environment,
+    Healthcheck, HealthcheckTest, Service, Services,
+};
+
+use crate::config::{Dev, DEVTOOL_DEFAULT_TAG, DOCKERCOMPOSE_DEFAULT_PATH};
+
+pub const APP_SERVICE_NAME: &str = "app";
+pub const DEVTOOL_SERVICE_NAME: &str = "devtool";
+pub const POSTGRES_SERVICE_NAME: &str = "postgres";
+const DEVTOOL_IMAGE: &str = "lenra/devtools";
+const POSTGRES_IMAGE: &str = "postgres";
+const POSTGRES_IMAGE_TAG: &str = "13";
+const OF_WATCHDOG_PORT: u16 = 8080;
+const DEVTOOL_PORT: u16 = 4000;
+
+/// Generates the docker-compose.yml file
+pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>) {
+    let compose_content = generate_docker_compose_content(dockerfile, dev_conf);
+    let compose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+    fs::write(compose_path, compose_content).expect("Unable to write the docker-compose file");
+}
+
+fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>) -> String {
+    let postgres_envs = [
+        ("POSTGRES_USER".to_string(), Some("postgres".to_string())),
+        (
+            "POSTGRES_PASSWORD".to_string(),
+            Some("postgres".to_string()),
+        ),
+        ("POSTGRES_DB".to_string(), Some("lenra_devtool".to_string())),
+    ];
+    let devtool_envs: [(String, Option<String>); 6] = [
+        postgres_envs.clone(),
+        [
+            (
+                "POSTGRES_HOST".to_string(),
+                Some(POSTGRES_SERVICE_NAME.to_string()),
+            ),
+            (
+                "OF_WATCHDOG_URL".to_string(),
+                Some(format!("http://{}:{}", APP_SERVICE_NAME, OF_WATCHDOG_PORT)),
+            ),
+            (
+                "LENRA_API_URL".to_string(),
+                Some(format!("http://{}:{}", DEVTOOL_SERVICE_NAME, DEVTOOL_PORT)),
+            ),
+        ],
+    ]
+    .concat()
+    .try_into()
+    .unwrap();
+
+    let devtool_tag = if let Some(conf) = dev_conf {
+        conf.devtool_tag.as_str()
+    } else {
+        DEVTOOL_DEFAULT_TAG
+    };
+    let compose = Compose {
+        services: Some(Services(
+            [
+                (
+                    APP_SERVICE_NAME.into(),
+                    Some(Service {
+                        image: Some("lenra/my-app".into()),
+                        build_: Some(BuildStep::Advanced(AdvancedBuildStep {
+                            context: "..".into(),
+                            dockerfile: Some(dockerfile.to_str().unwrap().into()),
+                            ..Default::default()
+                        })),
+                        depends_on: Some(DependsOnOptions::Conditional(
+                            [(
+                                DEVTOOL_SERVICE_NAME.into(),
+                                DependsCondition {
+                                    condition: "service_healthy".into(),
+                                },
+                            )]
+                            .into(),
+                        )),
+                        // TODO: Add resources management  when managed by the docker-compose-types lib
+                        ..Default::default()
+                    }),
+                ),
+                (
+                    DEVTOOL_SERVICE_NAME.into(),
+                    Some(Service {
+                        image: Some(format!("{}:{}", DEVTOOL_IMAGE, devtool_tag)),
+                        ports: Some(vec![format!("{}:{}", DEVTOOL_PORT, DEVTOOL_PORT)]),
+                        environment: Some(Environment::KvPair(devtool_envs.into())),
+                        depends_on: Some(DependsOnOptions::Conditional(
+                            [(
+                                POSTGRES_SERVICE_NAME.into(),
+                                DependsCondition {
+                                    condition: "service_healthy".into(),
+                                },
+                            )]
+                            .into(),
+                        )),
+                        healthcheck: Some(Healthcheck {
+                            test: Some(HealthcheckTest::Multiple(vec![
+                                "CMD".into(),
+                                "wget".into(),
+                                "--spider".into(),
+                                "-q".into(),
+                                "http://localhost:4000".into(),
+                            ])),
+                            interval: Some("10s".into()),
+                            timeout: Some("5s".into()),
+                            retries: 5,
+                            disable: false,
+                        }),
+                        ..Default::default()
+                    }),
+                ),
+                (
+                    POSTGRES_SERVICE_NAME.into(),
+                    Some(Service {
+                        image: Some(format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG)),
+                        environment: Some(Environment::KvPair(postgres_envs.into())),
+                        healthcheck: Some(Healthcheck {
+                            test: Some(HealthcheckTest::Multiple(vec![
+                                "CMD".into(),
+                                "pg_isready".into(),
+                                "-U".into(),
+                                "postgres".into(),
+                            ])),
+                            interval: Some("5s".into()),
+                            timeout: None,
+                            retries: 5,
+                            disable: false,
+                        }),
+                        ..Default::default()
+                    }),
+                ),
+            ]
+            .into(),
+        )),
+        ..Default::default()
+    };
+    serde_yaml::to_string(&compose).expect("Error generating the docker-compose file content")
+}
+
+pub fn create_compose_command() -> Command {
+    let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+    let mut cmd = Command::new("docker");
+
+    cmd.arg("compose").arg("-f").arg(dockercompose_path);
+
+    cmd
+}
+
+pub fn compose_up() {
+    let mut command = create_compose_command();
+
+    command
+        .arg("up")
+        .arg("-d")
+        .stdout(Stdio::inherit())
+        .stderr(Stdio::inherit());
+
+    log::debug!("cmd: {:?}", command);
+    let output = command
+        .output()
+        .expect("Failed to start the docker-compose app");
+
+    if !output.status.success() {
+        panic!(
+            "An error occured while running the docker-compose app:\n{}\n{}",
+            String::from_utf8(output.stdout).unwrap(),
+            String::from_utf8(output.stderr).unwrap()
+        )
+    }
+}
+
+pub fn compose_build() {
+    let mut command = create_compose_command();
+    command.arg("build");
+
+    // Use Buildkit to improve performance
+    command.env("DOCKER_BUILDKIT", "1");
+
+    // Display std out & err
+    command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
+
+    log::debug!("Build: {:?}", command);
+    let output = command.output().expect("Failed building the Docker image");
+    if !output.status.success() {
+        panic!(
+            "An error occured while building the Docker image:\n{}\n{}",
+            String::from_utf8(output.stdout).unwrap(),
+            String::from_utf8(output.stderr).unwrap()
+        )
+    }
+}
+
+pub fn execute_compose_service_command(service: &str, cmd: &[&str]) {
+    let mut command = create_compose_command();
+
+    command.arg("exec").arg(service);
+
+    cmd.iter().for_each(|&part| {
+        command.arg(part);
+        ()
+    });
+
+    let output = command
+        .output()
+        .expect("Failed to execute the docker-compose exec command");
+
+    if !output.status.success() {
+        panic!(
+            "docker-compose exec exited with code {}:\n\tcmd: {:?}\n\tstdout: {}\n\tstderr: {}",
+            output.status.code().unwrap(),
+            command,
+            String::from_utf8(output.stdout).unwrap(),
+            String::from_utf8(output.stderr).unwrap()
+        )
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 030563a..b301bd9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,11 +6,9 @@ use clap::Parser;
 use cli::{Cli, CliCommand};
 use env_logger;
 
-mod build;
 mod cli;
 mod config;
-mod new;
-mod start;
+mod docker_compose;
 
 fn main() {
     env_logger::init();
diff --git a/src/start.rs b/src/start.rs
deleted file mode 100644
index 6626f53..0000000
--- a/src/start.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-pub use clap::Args;
-
-use crate::cli::CliCommand;
-use crate::config::DEFAULT_CONFIG_FILE;
-
-#[derive(Args)]
-pub struct Start {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-}
-
-impl CliCommand for Start {
-    fn run(&self) {
-        todo!()
-    }
-}

From d53082817682adb298394093804b91d055431c7c Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:10:32 +0200
Subject: [PATCH 09/76] ci: Fix cargo publish

---
 Cargo.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cd8f03f..522450c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,14 +4,12 @@ version = "0.0.0"
 edition = "2021"
 license = "MIT"
 description = "The Lenra command line interface"
-readme = "../README.md"
 repository = "https://github.com/lenra-io/lenra_cli"
 keywords = ["cli", "lenra"]
 categories = ["command-line-utilities"]
 include = [
     "**/*.rs",
     "Cargo.toml",
-    "README.md",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

From 3c643a229bd4fc039cd68169dc0fa45addc8fdcc Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:33:12 +0200
Subject: [PATCH 10/76] feat: Add logs command (#14)

---
 Cargo.lock            |   4 +-
 Cargo.toml            |   2 +-
 README.md             |  32 ++++++++++++
 src/cli/logs.rs       | 110 ++++++++++++++++++++++++++++++++++++++++++
 src/cli/mod.rs        |   8 ++-
 src/cli/start.rs      |  14 ++----
 src/cli/stop.rs       |  37 ++++----------
 src/docker_compose.rs |   4 +-
 8 files changed, 168 insertions(+), 43 deletions(-)
 create mode 100644 src/cli/logs.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3c3162f..fe2d0a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,9 +147,9 @@ dependencies = [
 
 [[package]]
 name = "docker-compose-types"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7213b15aa1b9e80b202b9e8c95dd0e2df45805dba8301dda2f72549436be67"
+checksum = "c00fe22855b33a9b97809f4053f6e7b3bf6281f28fbbf82b9fe302195ab74535"
 dependencies = [
  "derive_builder",
  "indexmap",
diff --git a/Cargo.toml b/Cargo.toml
index 522450c..1c492bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,5 +29,5 @@ env_logger = "0.9.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
 dofigen = "1"
-docker-compose-types = "0.2.1"
+docker-compose-types = "0.2.2"
 open = "1"
diff --git a/README.md b/README.md
index 1d0d309..a787deb 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,7 @@ OPTIONS:
 SUBCOMMANDS:
     build    Build your app in release mode
     help     Print this message or the help of the given subcommand(s)
+    logs     View output from the containers
     new      Create a new Lenra app project
     start    Start your app previously built with the build command
     stop     Stop your app previously started with the start command
@@ -100,6 +101,7 @@ This tools contains many subcommands to help you doing what you need.
 - [new](#new): creates a new Lenra app project
 - [build](#build): builds the Lenra app of the current directory
 - [start](#start): starts your app previously built with the build command
+- [logs](#logs): displays output from the containers
 - [stop](#stop): stops your app previously started with the start command
 
 #### new
@@ -163,6 +165,36 @@ OPTIONS:
     -h, --help               Print help information
 ```
 
+#### logs
+
+This subcommand displays output from the containers.
+
+```bash
+$ lenra logs --help
+lenra-logs 
+View output from the containers
+
+USAGE:
+    lenra logs [OPTIONS] [SERVICES]...
+
+ARGS:
+    <SERVICES>...    The logged service list [default: app] [possible values: app, devtool,
+                     postgres]
+
+OPTIONS:
+    -f, --follow           Follow log output
+    -h, --help             Print help information
+        --no-color         Produce monochrome output
+        --no-log-prefix    Don't print prefix in logs
+        --since <SINCE>    Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g.
+                           42m for 42 minutes)
+    -t, --timestamps       Show timestamps
+        --tail <TAIL>      Number of lines to show from the end of the logs for each container
+                           [default: all]
+        --until <UNTIL>    Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative
+                           (e.g. 42m for 42 minutes)
+```
+
 #### stop
 
 This subcommand stops the Lenra app of the current directory and removes the Docker Compose elements.
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
new file mode 100644
index 0000000..49ba6e4
--- /dev/null
+++ b/src/cli/logs.rs
@@ -0,0 +1,110 @@
+use std::process::Stdio;
+
+pub use clap::Args;
+
+use crate::cli::CliCommand;
+use crate::docker_compose::{
+    create_compose_command, APP_SERVICE_NAME, DEVTOOL_SERVICE_NAME, POSTGRES_SERVICE_NAME,
+};
+
+#[derive(Args)]
+pub struct Logs {
+    /// Follow log output
+    #[clap(short, long, action)]
+    follow: bool,
+
+    /// Produce monochrome output
+    #[clap(long, action)]
+    no_color: bool,
+
+    /// Don't print prefix in logs
+    #[clap(long, action)]
+    no_log_prefix: bool,
+
+    /// Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)
+    #[clap(long)]
+    pub since: Option<String>,
+
+    /// Number of lines to show from the end of the logs for each container
+    #[clap(long, default_value = "all")]
+    pub tail: String,
+
+    /// Show timestamps
+    #[clap(short, long, action)]
+    timestamps: bool,
+
+    /// Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)
+    #[clap(long)]
+    pub until: Option<String>,
+
+    /// The logged service list
+    #[clap(value_enum, default_value = "app")]
+    services: Vec<Service>,
+}
+
+#[derive(clap::ValueEnum, Clone, Debug)]
+enum Service {
+    App,
+    Devtool,
+    Postgres,
+}
+
+impl Service {
+    fn to_str(&self) -> &str {
+        match self {
+            Service::App => APP_SERVICE_NAME,
+            Service::Devtool => DEVTOOL_SERVICE_NAME,
+            Service::Postgres => POSTGRES_SERVICE_NAME,
+        }
+    }
+}
+
+impl CliCommand for Logs {
+    fn run(&self) {
+        log::info!("Show logs");
+
+        let mut command = create_compose_command();
+
+        command
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit())
+            .arg("logs")
+            .arg("--tail")
+            .arg(self.tail.clone());
+
+        if self.follow {
+            command.arg("--follow");
+        }
+        if self.no_color {
+            command.arg("--no-color");
+        }
+        if self.no_log_prefix {
+            command.arg("--no-log-prefix");
+        }
+        if let Some(since) = self.since.clone() {
+            command.arg("--since").arg(since);
+        }
+        if self.timestamps {
+            command.arg("--timestamps");
+        }
+        if let Some(until) = self.until.clone() {
+            command.arg("--until").arg(until);
+        }
+        self.services.iter().for_each(|service| {
+            command.arg(service.to_str());
+        });
+
+        log::debug!("cmd: {:?}", command);
+        let output = command
+            .output()
+            .expect("Failed to logs the docker-compose app");
+
+        if !output.status.success() {
+            panic!(
+                "An error occured while stoping the docker-compose app:\n{}\n{}",
+                String::from_utf8(output.stdout).unwrap(),
+                String::from_utf8(output.stderr).unwrap()
+            )
+        }
+    }
+}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 017c76d..9310d75 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,15 +1,16 @@
 pub use clap::{Args, Parser, Subcommand};
 
-use self::{build::Build, new::New, start::Start, stop::Stop};
+use self::{build::Build, logs::Logs, new::New, start::Start, stop::Stop};
 
 mod build;
+mod logs;
 mod new;
 mod start;
 mod stop;
 
 /// The Lenra command line interface
 #[derive(Parser)]
-#[clap(author, version, about, long_about = None)]
+#[clap(author, version, about, long_about = None, rename_all = "kebab-case")]
 pub struct Cli {
     #[clap(subcommand)]
     pub command: Command,
@@ -28,6 +29,8 @@ pub enum Command {
     Build(Build),
     /// Start your app previously built with the build command
     Start(Start),
+    /// View output from the containers
+    Logs(Logs),
     /// Stop your app previously started with the start command
     Stop(Stop),
 }
@@ -38,6 +41,7 @@ impl CliCommand for Command {
             Command::New(new) => new.run(),
             Command::Build(build) => build.run(),
             Command::Start(start) => start.run(),
+            Command::Logs(logs) => logs.run(),
             Command::Stop(stop) => stop.run(),
         };
     }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index eee821c..2883753 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -13,9 +13,10 @@ pub struct Start {
     pub config: std::path::PathBuf,
 }
 
-impl Start {
-    /// Starts the docker-compose
-    fn start_docker_compose(&self) {
+impl CliCommand for Start {
+    fn run(&self) {
+        log::info!("Starting the app");
+
         let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
         if !dockercompose_path.exists() {
             let conf = load_config_file(&self.config);
@@ -39,10 +40,3 @@ impl Start {
         open::that("http://localhost:4000").unwrap();
     }
 }
-
-impl CliCommand for Start {
-    fn run(&self) {
-        log::info!("Starting the app");
-        self.start_docker_compose();
-    }
-}
diff --git a/src/cli/stop.rs b/src/cli/stop.rs
index 67f4b60..a809dd1 100644
--- a/src/cli/stop.rs
+++ b/src/cli/stop.rs
@@ -1,33 +1,23 @@
-use std::path::PathBuf;
-use std::process::{Command, Stdio};
+use std::process::Stdio;
 
 pub use clap::Args;
 
 use crate::cli::CliCommand;
-use crate::config::{DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
+use crate::docker_compose::create_compose_command;
 
 #[derive(Args)]
-pub struct Stop {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-}
+pub struct Stop;
 
-impl Stop {
-    /// Starts the docker-compose
-    fn stop_docker_compose(&self) {
-        let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
-        if !dockercompose_path.exists() {}
+impl CliCommand for Stop {
+    fn run(&self) {
+        log::info!("Stoping the app");
 
-        let mut command = Command::new("docker");
+        let mut command = create_compose_command();
 
-        // TODO: display std out & err
-        command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
         command
-            .arg("compose")
-            .arg("-f")
-            .arg(dockercompose_path)
-            .arg("down");
+            .arg("down")
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit());
 
         log::debug!("cmd: {:?}", command);
         let output = command
@@ -42,10 +32,3 @@ impl Stop {
         }
     }
 }
-
-impl CliCommand for Stop {
-    fn run(&self) {
-        log::info!("Stoping the app");
-        self.stop_docker_compose();
-    }
-}
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index d048f9e..6719ae3 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -111,7 +111,8 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                                 "http://localhost:4000".into(),
                             ])),
                             interval: Some("10s".into()),
-                            timeout: Some("5s".into()),
+                            start_period: Some("5s".into()),
+                            timeout: Some("2s".into()),
                             retries: 5,
                             disable: false,
                         }),
@@ -131,6 +132,7 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                                 "postgres".into(),
                             ])),
                             interval: Some("5s".into()),
+                            start_period: None,
                             timeout: None,
                             retries: 5,
                             disable: false,

From 098288b3738ebff879c27c5d20398c2c7ec9c2ad Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:56:54 +0200
Subject: [PATCH 11/76] feat: Set custom name to the app image (#12)

---
 .gitignore            |  1 +
 src/config.rs         | 12 +++-----
 src/docker_compose.rs | 70 ++++++++++++++++++++++++++++++++++++++-----
 src/git.rs            | 19 ++++++++++++
 src/main.rs           |  1 +
 5 files changed, 87 insertions(+), 16 deletions(-)
 create mode 100644 src/git.rs

diff --git a/.gitignore b/.gitignore
index ea8c4bf..bef4516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+.vscode
 /target
diff --git a/src/config.rs b/src/config.rs
index 74d5334..5cb146f 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -11,8 +11,6 @@ use crate::docker_compose::generate_docker_compose;
 pub const DEFAULT_CONFIG_FILE: &str = "lenra.yml";
 pub const LENRA_CACHE_DIRECTORY: &str = ".lenra";
 
-pub const DEVTOOL_DEFAULT_TAG: &str = "beta";
-
 pub const DOCKERFILE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "Dockerfile"];
 pub const DOCKERIGNORE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "Dockerfile.dockerignore"];
 pub const DOCKERCOMPOSE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "docker-compose.yml"];
@@ -48,8 +46,10 @@ pub struct Application {
 #[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct Dev {
-    #[serde(default = "devtool_default_tag")]
-    pub devtool_tag: String,
+    pub app_name: Option<String>,
+    pub app_tag: Option<String>,
+    pub devtool_tag: Option<String>,
+    pub postgres_tag: Option<String>,
 }
 
 /** The application generator configuration */
@@ -230,10 +230,6 @@ impl Application {
     }
 }
 
-fn devtool_default_tag() -> String {
-    DEVTOOL_DEFAULT_TAG.to_string()
-}
-
 impl Default for Generator {
     fn default() -> Self {
         Generator::Unknow
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 6719ae3..5cbf561 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -1,5 +1,5 @@
 use std::{
-    fs,
+    env, fs,
     path::PathBuf,
     process::{Command, Stdio},
 };
@@ -9,12 +9,19 @@ use docker_compose_types::{
     Healthcheck, HealthcheckTest, Service, Services,
 };
 
-use crate::config::{Dev, DEVTOOL_DEFAULT_TAG, DOCKERCOMPOSE_DEFAULT_PATH};
+use crate::{
+    config::{Dev, DOCKERCOMPOSE_DEFAULT_PATH},
+    git::get_current_branch,
+};
 
 pub const APP_SERVICE_NAME: &str = "app";
 pub const DEVTOOL_SERVICE_NAME: &str = "devtool";
 pub const POSTGRES_SERVICE_NAME: &str = "postgres";
+const APP_BASE_IMAGE: &str = "lenra/app/";
+const APP_DEFAULT_IMAGE: &str = "my";
+const APP_DEFAULT_IMAGE_TAG: &str = "latest";
 const DEVTOOL_IMAGE: &str = "lenra/devtools";
+const DEVTOOL_DEFAULT_TAG: &str = "beta";
 const POSTGRES_IMAGE: &str = "postgres";
 const POSTGRES_IMAGE_TAG: &str = "13";
 const OF_WATCHDOG_PORT: u16 = 8080;
@@ -57,18 +64,50 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
     .try_into()
     .unwrap();
 
-    let devtool_tag = if let Some(conf) = dev_conf {
-        conf.devtool_tag.as_str()
+    let default_app_image = current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string());
+    let default_app_tag = get_current_branch().unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
+
+    let service_images = if let Some(dev) = dev_conf {
+        ServiceImages {
+            app: format!(
+                "{}{}:{}",
+                APP_BASE_IMAGE,
+                dev.app_name.clone().unwrap_or(default_app_image),
+                dev.app_tag.clone().unwrap_or(default_app_tag)
+            ),
+            devtool: format!(
+                "{}:{}",
+                DEVTOOL_IMAGE,
+                dev.devtool_tag
+                    .clone()
+                    .unwrap_or(DEVTOOL_DEFAULT_TAG.to_string())
+            ),
+            postgres: format!(
+                "{}:{}",
+                POSTGRES_IMAGE,
+                dev.postgres_tag
+                    .clone()
+                    .unwrap_or(POSTGRES_IMAGE_TAG.to_string())
+            ),
+        }
     } else {
-        DEVTOOL_DEFAULT_TAG
+        ServiceImages {
+            app: format!(
+                "{}{}:{}",
+                APP_BASE_IMAGE, default_app_image, default_app_tag
+            ),
+            devtool: format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG),
+            postgres: format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG),
+        }
     };
+
     let compose = Compose {
         services: Some(Services(
             [
                 (
                     APP_SERVICE_NAME.into(),
                     Some(Service {
-                        image: Some("lenra/my-app".into()),
+                        image: Some(service_images.app),
                         build_: Some(BuildStep::Advanced(AdvancedBuildStep {
                             context: "..".into(),
                             dockerfile: Some(dockerfile.to_str().unwrap().into()),
@@ -90,7 +129,7 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                 (
                     DEVTOOL_SERVICE_NAME.into(),
                     Some(Service {
-                        image: Some(format!("{}:{}", DEVTOOL_IMAGE, devtool_tag)),
+                        image: Some(service_images.devtool),
                         ports: Some(vec![format!("{}:{}", DEVTOOL_PORT, DEVTOOL_PORT)]),
                         environment: Some(Environment::KvPair(devtool_envs.into())),
                         depends_on: Some(DependsOnOptions::Conditional(
@@ -122,7 +161,7 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                 (
                     POSTGRES_SERVICE_NAME.into(),
                     Some(Service {
-                        image: Some(format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG)),
+                        image: Some(service_images.postgres),
                         environment: Some(Environment::KvPair(postgres_envs.into())),
                         healthcheck: Some(Healthcheck {
                             test: Some(HealthcheckTest::Multiple(vec![
@@ -225,3 +264,18 @@ pub fn execute_compose_service_command(service: &str, cmd: &[&str]) {
         )
     }
 }
+
+fn current_dir_name() -> Option<String> {
+    if let Ok(path) = env::current_dir() {
+        path.file_name()
+            .map(|name| String::from(name.to_str().unwrap()))
+    } else {
+        None
+    }
+}
+
+struct ServiceImages {
+    app: String,
+    devtool: String,
+    postgres: String,
+}
diff --git a/src/git.rs b/src/git.rs
new file mode 100644
index 0000000..c3dd9cd
--- /dev/null
+++ b/src/git.rs
@@ -0,0 +1,19 @@
+use std::process::Command;
+
+pub fn get_current_branch() -> Option<String> {
+    let output = Command::new("git")
+        .arg("rev-parse")
+        .arg("--abbrev-ref")
+        .arg("HEAD")
+        .output();
+
+    if let Ok(out) = output {
+        if out.status.success() {
+            return String::from_utf8(out.stdout)
+                .map(|name| name.trim().to_string())
+                .ok();
+        }
+    }
+
+    None
+}
diff --git a/src/main.rs b/src/main.rs
index b301bd9..b5b63a9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,6 +9,7 @@ use env_logger;
 mod cli;
 mod config;
 mod docker_compose;
+mod git;
 
 fn main() {
     env_logger::init();

From 87d09d60780bac7923d5e05e5f9f56c49985a716 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:31:00 +0200
Subject: [PATCH 12/76] feat: Add the mongo service in the docker-compose (#11)

---
 src/cli/logs.rs       |   5 +-
 src/cli/start.rs      |   7 ++-
 src/config.rs         |   1 +
 src/docker_compose.rs | 132 +++++++++++++++++++++++++++++++-----------
 4 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index 49ba6e4..dd20cb3 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -4,7 +4,8 @@ pub use clap::Args;
 
 use crate::cli::CliCommand;
 use crate::docker_compose::{
-    create_compose_command, APP_SERVICE_NAME, DEVTOOL_SERVICE_NAME, POSTGRES_SERVICE_NAME,
+    create_compose_command, APP_SERVICE_NAME, DEVTOOL_SERVICE_NAME, MONGO_SERVICE_NAME,
+    POSTGRES_SERVICE_NAME,
 };
 
 #[derive(Args)]
@@ -47,6 +48,7 @@ enum Service {
     App,
     Devtool,
     Postgres,
+    Mongo,
 }
 
 impl Service {
@@ -55,6 +57,7 @@ impl Service {
             Service::App => APP_SERVICE_NAME,
             Service::Devtool => DEVTOOL_SERVICE_NAME,
             Service::Postgres => POSTGRES_SERVICE_NAME,
+            Service::Mongo => MONGO_SERVICE_NAME,
         }
     }
 }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index 2883753..007ebe9 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -28,14 +28,17 @@ impl CliCommand for Start {
         // Start the containers
         compose_up();
         // Stop the devtool app env to reset cache
-        execute_compose_service_command(
+        let result = execute_compose_service_command(
             DEVTOOL_SERVICE_NAME,
             &[
                 "bin/dev_tools",
                 "rpc",
-                "ApplicationRunner.Environments.Managers.stop_env(1)",
+                "ApplicationRunner.Environment.DynamicSupervisor.stop_env(1)",
             ],
         );
+        if let Err(error) = result {
+            log::info!("{}", error);
+        }
         // Open the app
         open::that("http://localhost:4000").unwrap();
     }
diff --git a/src/config.rs b/src/config.rs
index 5cb146f..0f78c86 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -50,6 +50,7 @@ pub struct Dev {
     pub app_tag: Option<String>,
     pub devtool_tag: Option<String>,
     pub postgres_tag: Option<String>,
+    pub mongo_tag: Option<String>,
 }
 
 /** The application generator configuration */
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 5cbf561..18c9d69 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -1,12 +1,13 @@
 use std::{
+    convert::TryInto,
     env, fs,
     path::PathBuf,
-    process::{Command, Stdio},
+    process::{self, Output, Stdio},
 };
 
 use docker_compose_types::{
-    AdvancedBuildStep, BuildStep, Compose, DependsCondition, DependsOnOptions, Environment,
-    Healthcheck, HealthcheckTest, Service, Services,
+    AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions,
+    Environment, Healthcheck, HealthcheckTest, Service, Services,
 };
 
 use crate::{
@@ -17,6 +18,7 @@ use crate::{
 pub const APP_SERVICE_NAME: &str = "app";
 pub const DEVTOOL_SERVICE_NAME: &str = "devtool";
 pub const POSTGRES_SERVICE_NAME: &str = "postgres";
+pub const MONGO_SERVICE_NAME: &str = "mongodb";
 const APP_BASE_IMAGE: &str = "lenra/app/";
 const APP_DEFAULT_IMAGE: &str = "my";
 const APP_DEFAULT_IMAGE_TAG: &str = "latest";
@@ -24,8 +26,11 @@ const DEVTOOL_IMAGE: &str = "lenra/devtools";
 const DEVTOOL_DEFAULT_TAG: &str = "beta";
 const POSTGRES_IMAGE: &str = "postgres";
 const POSTGRES_IMAGE_TAG: &str = "13";
+const MONGO_IMAGE: &str = "mongo";
+const MONGO_IMAGE_TAG: &str = "5.0.11-focal";
 const OF_WATCHDOG_PORT: u16 = 8080;
 const DEVTOOL_PORT: u16 = 4000;
+const MONGO_PORT: u16 = 27017;
 
 /// Generates the docker-compose.yml file
 pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>) {
@@ -35,7 +40,7 @@ pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>) {
 }
 
 fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>) -> String {
-    let postgres_envs = [
+    let mut devtool_env_vec: Vec<(String, Option<String>)> = vec![
         ("POSTGRES_USER".to_string(), Some("postgres".to_string())),
         (
             "POSTGRES_PASSWORD".to_string(),
@@ -43,26 +48,39 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
         ),
         ("POSTGRES_DB".to_string(), Some("lenra_devtool".to_string())),
     ];
-    let devtool_envs: [(String, Option<String>); 6] = [
-        postgres_envs.clone(),
-        [
-            (
-                "POSTGRES_HOST".to_string(),
-                Some(POSTGRES_SERVICE_NAME.to_string()),
-            ),
-            (
-                "OF_WATCHDOG_URL".to_string(),
-                Some(format!("http://{}:{}", APP_SERVICE_NAME, OF_WATCHDOG_PORT)),
-            ),
-            (
-                "LENRA_API_URL".to_string(),
-                Some(format!("http://{}:{}", DEVTOOL_SERVICE_NAME, DEVTOOL_PORT)),
-            ),
-        ],
-    ]
-    .concat()
-    .try_into()
-    .unwrap();
+    let postgres_envs: [(String, Option<String>); 3] = devtool_env_vec.clone().try_into().unwrap();
+
+    devtool_env_vec.push((
+        "POSTGRES_HOST".to_string(),
+        Some(POSTGRES_SERVICE_NAME.to_string()),
+    ));
+    devtool_env_vec.push((
+        "OF_WATCHDOG_URL".to_string(),
+        Some(format!("http://{}:{}", APP_SERVICE_NAME, OF_WATCHDOG_PORT)),
+    ));
+    devtool_env_vec.push((
+        "LENRA_API_URL".to_string(),
+        Some(format!("http://{}:{}", DEVTOOL_SERVICE_NAME, DEVTOOL_PORT)),
+    ));
+    devtool_env_vec.push((
+        "MONGO_URL".to_string(),
+        Some(format!("mongodb://{}:{}", MONGO_SERVICE_NAME, MONGO_PORT)),
+    ));
+    let devtool_envs: [(String, Option<String>); 7] = devtool_env_vec.try_into().unwrap();
+
+    let mongo_envs: [(String, Option<String>); 2] = [
+        (
+            "MONGO_INITDB_DATABASE".to_string(),
+            Some("test".to_string()),
+        ),
+        (
+            "CONFIG".to_string(),
+            Some(format!(
+                r#"{{"_id" : "rs0", "members" : [{{"_id" : 0,"host" : "{}:{}"}}]}}"#,
+                MONGO_SERVICE_NAME, MONGO_PORT
+            )),
+        ),
+    ];
 
     let default_app_image = current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string());
     let default_app_tag = get_current_branch().unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
@@ -89,6 +107,11 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                     .clone()
                     .unwrap_or(POSTGRES_IMAGE_TAG.to_string())
             ),
+            mongo: format!(
+                "{}:{}",
+                MONGO_IMAGE,
+                dev.mongo_tag.clone().unwrap_or(MONGO_IMAGE_TAG.to_string())
+            ),
         }
     } else {
         ServiceImages {
@@ -98,6 +121,7 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
             ),
             devtool: format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG),
             postgres: format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG),
+            mongo: format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG),
         }
     };
 
@@ -138,6 +162,11 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                                 DependsCondition {
                                     condition: "service_healthy".into(),
                                 },
+                            ),(
+                                MONGO_SERVICE_NAME.into(),
+                                DependsCondition {
+                                    condition: "service_healthy".into(),
+                                },
                             )]
                             .into(),
                         )),
@@ -170,12 +199,29 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                                 "-U".into(),
                                 "postgres".into(),
                             ])),
+                            start_period: Some("10s".into()),
+                            interval: Some("5s".into()),
+                            timeout: None,
+                            retries: 5,
+                            disable: false,
+                        }),
+                        ..Default::default()
+                    }),
+                ),
+                (
+                    MONGO_SERVICE_NAME.into(),
+                    Some(Service {
+                        image: Some(service_images.mongo),
+                        environment: Some(Environment::KvPair(mongo_envs.into())),
+                        healthcheck: Some(Healthcheck {
+                            test: Some(HealthcheckTest::Single(r#"test $$(echo "rs.initiate($$CONFIG).ok || rs.status().ok" | mongo --quiet) -eq 1"#.to_string())),
+                            start_period: Some("10s".into()),
                             interval: Some("5s".into()),
-                            start_period: None,
                             timeout: None,
                             retries: 5,
                             disable: false,
                         }),
+                        command: Some(Command::Simple("mongod --replSet rs0".into())),
                         ..Default::default()
                     }),
                 ),
@@ -187,9 +233,9 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
     serde_yaml::to_string(&compose).expect("Error generating the docker-compose file content")
 }
 
-pub fn create_compose_command() -> Command {
+pub fn create_compose_command() -> process::Command {
     let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
-    let mut cmd = Command::new("docker");
+    let mut cmd = process::Command::new("docker");
 
     cmd.arg("compose").arg("-f").arg(dockercompose_path);
 
@@ -240,7 +286,10 @@ pub fn compose_build() {
     }
 }
 
-pub fn execute_compose_service_command(service: &str, cmd: &[&str]) {
+pub fn execute_compose_service_command(
+    service: &str,
+    cmd: &[&str],
+) -> Result<(), Box<dyn std::error::Error>> {
     let mut command = create_compose_command();
 
     command.arg("exec").arg(service);
@@ -250,15 +299,31 @@ pub fn execute_compose_service_command(service: &str, cmd: &[&str]) {
         ()
     });
 
-    let output = command
-        .output()
-        .expect("Failed to execute the docker-compose exec command");
+    let output = command.output()?;
 
     if !output.status.success() {
-        panic!(
+        return Err(Error { command, output }.into());
+    }
+
+    Ok(())
+}
+
+#[derive(Debug)]
+pub struct Error {
+    command: process::Command,
+    output: Output,
+}
+
+impl std::error::Error for Error {}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let output = self.output.clone();
+        write!(
+            f,
             "docker-compose exec exited with code {}:\n\tcmd: {:?}\n\tstdout: {}\n\tstderr: {}",
             output.status.code().unwrap(),
-            command,
+            self.command,
             String::from_utf8(output.stdout).unwrap(),
             String::from_utf8(output.stderr).unwrap()
         )
@@ -278,4 +343,5 @@ struct ServiceImages {
     app: String,
     devtool: String,
     postgres: String,
+    mongo: String,
 }

From df797a48a2864723700304a596ec602341c63a9c Mon Sep 17 00:00:00 2001
From: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:11:29 +0200
Subject: [PATCH 13/76] feat: Add command for dockerfile generation (#23)

---
 src/cli/init.rs | 20 ++++++++++++++++++++
 src/cli/mod.rs  |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/cli/init.rs

diff --git a/src/cli/init.rs b/src/cli/init.rs
new file mode 100644
index 0000000..0f77573
--- /dev/null
+++ b/src/cli/init.rs
@@ -0,0 +1,20 @@
+use clap;
+
+use crate::cli::CliCommand;
+use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
+
+#[derive(clap::Args)]
+pub struct Init {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+}
+
+impl CliCommand for Init {
+    fn run(&self) {
+        let conf = load_config_file(&self.config);
+        // TODO: check the components API version
+
+        conf.generate_files();
+    }
+}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 9310d75..af2cff0 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,8 +1,9 @@
 pub use clap::{Args, Parser, Subcommand};
 
-use self::{build::Build, logs::Logs, new::New, start::Start, stop::Stop};
+use self::{build::Build, init::Init, logs::Logs, new::New, start::Start, stop::Stop};
 
 mod build;
+mod init;
 mod logs;
 mod new;
 mod start;
@@ -33,6 +34,8 @@ pub enum Command {
     Logs(Logs),
     /// Stop your app previously started with the start command
     Stop(Stop),
+    /// Generates dockerfile and docker compose file with the init command
+    Init(Init),
 }
 
 impl CliCommand for Command {
@@ -43,6 +46,7 @@ impl CliCommand for Command {
             Command::Start(start) => start.run(),
             Command::Logs(logs) => logs.run(),
             Command::Stop(stop) => stop.run(),
+            Command::Init(init) => init.run(),
         };
     }
 }

From e18e7cf0d08c3ae0b3c75b895003437310be342e Mon Sep 17 00:00:00 2001
From: Harald Steinmueller <harald.steinmueller@gmail.com>
Date: Tue, 4 Oct 2022 12:49:17 +0200
Subject: [PATCH 14/76] Remove volumes on stop command (#32)

---
 src/cli/stop.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cli/stop.rs b/src/cli/stop.rs
index a809dd1..b4ae724 100644
--- a/src/cli/stop.rs
+++ b/src/cli/stop.rs
@@ -16,6 +16,7 @@ impl CliCommand for Stop {
 
         command
             .arg("down")
+            .arg("--volumes")
             .stdout(Stdio::inherit())
             .stderr(Stdio::inherit());
 

From 3da7f3d17ca873e068a5bd209b96141cef4362ac Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 7 Oct 2022 17:15:38 +0200
Subject: [PATCH 15/76] fix(deps): Dofigen update (#37)

---
 Cargo.lock | 77 +++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe2d0a0..0a21c5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
  "memchr",
 ]
@@ -42,9 +42,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.2.17"
+version = "3.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
 dependencies = [
  "atty",
  "bitflags",
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.17"
+version = "3.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -159,22 +159,21 @@ dependencies = [
 
 [[package]]
 name = "dofigen"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71144688ed025d3b62fa7f2d24f6f72891843c49976869c6d4b9927490ce9360"
+checksum = "3d305bfc3e9688f7addf7baa68ee6ce333112b88f7817e9f4655b445e5844b2b"
 dependencies = [
- "clap",
  "serde",
  "serde_json",
- "serde_yaml 0.9.9",
+ "serde_yaml 0.9.13",
  "thiserror",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
 dependencies = [
  "atty",
  "humantime",
@@ -259,14 +258,14 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "serde_yaml 0.9.9",
+ "serde_yaml 0.9.13",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
 
 [[package]]
 name = "linked-hash-map"
@@ -291,9 +290,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "once_cell"
-version = "1.13.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
 [[package]]
 name = "open"
@@ -343,9 +342,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
  "unicode-ident",
 ]
@@ -384,18 +383,18 @@ checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "serde"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -404,9 +403,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
  "itoa",
  "ryu",
@@ -427,9 +426,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.9"
+version = "0.9.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50845f68d5c693aac7d72a25415ddd21cb8182c04eafe447b73af55a05f9e1b"
+checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1"
 dependencies = [
  "indexmap",
  "itoa",
@@ -446,9 +445,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -466,24 +465,24 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 
 [[package]]
 name = "thiserror"
-version = "1.0.32"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.32"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -492,15 +491,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0"
+checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"
 
 [[package]]
 name = "version_check"

From cc4bc8dc886d8811b81a3d90fd52c84658a94636 Mon Sep 17 00:00:00 2001
From: Emric Pichonnier <emric.pichonnier@lenra.me>
Date: Mon, 10 Oct 2022 14:28:15 +0200
Subject: [PATCH 16/76] feat: add expose options (#38)

---
 src/cli/build.rs      |  5 ++-
 src/cli/init.rs       |  3 +-
 src/cli/start.rs      |  5 ++-
 src/config.rs         |  8 ++---
 src/docker_compose.rs | 81 ++++++++++++++++++++++++-------------------
 5 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/src/cli/build.rs b/src/cli/build.rs
index 89a3849..b495e1b 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -11,6 +11,9 @@ pub struct Build {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
+
+    #[clap(long, action)]
+    pub expose: bool,
 }
 
 impl Build {
@@ -29,7 +32,7 @@ impl CliCommand for Build {
         let conf = load_config_file(&self.config);
         // TODO: check the components API version
 
-        conf.generate_files();
+        conf.generate_files(self.expose);
 
         // self.build_docker_image(conf);
         self.build_docker_compose();
diff --git a/src/cli/init.rs b/src/cli/init.rs
index 0f77573..93607c1 100644
--- a/src/cli/init.rs
+++ b/src/cli/init.rs
@@ -14,7 +14,6 @@ impl CliCommand for Init {
     fn run(&self) {
         let conf = load_config_file(&self.config);
         // TODO: check the components API version
-
-        conf.generate_files();
+        conf.generate_docker_files();
     }
 }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index 007ebe9..1f1cdf6 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -11,6 +11,9 @@ pub struct Start {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
+
+    #[clap(long, action)]
+    pub expose: bool,
 }
 
 impl CliCommand for Start {
@@ -22,7 +25,7 @@ impl CliCommand for Start {
             let conf = load_config_file(&self.config);
             // TODO: check the components API version
 
-            conf.generate_files();
+            conf.generate_files(self.expose);
         }
 
         // Start the containers
diff --git a/src/config.rs b/src/config.rs
index 0f78c86..a9b0c01 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -92,9 +92,9 @@ pub struct Dockerfile {
 
 impl Application {
     /// Generates all the files needed to build and run the application
-    pub fn generate_files(&self) {
+    pub fn generate_files(&self, expose: bool) {
         self.generate_docker_files();
-        self.generate_docker_compose_file();
+        self.generate_docker_compose_file(expose);
     }
 
     pub fn generate_docker_files(&self) {
@@ -118,7 +118,7 @@ impl Application {
         }
     }
 
-    pub fn generate_docker_compose_file(&self) {
+    pub fn generate_docker_compose_file(&self, expose: bool) {
         log::info!("Docker Compose file generation");
         // create the `.lenra` cache directory
         fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
@@ -129,7 +129,7 @@ impl Application {
             DOCKERFILE_DEFAULT_PATH.iter().collect()
         };
 
-        generate_docker_compose(dockerfile, &self.dev);
+        generate_docker_compose(dockerfile, &self.dev, expose);
     }
 
     /// Builds a Docker image from a Dofigen structure
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 18c9d69..7638d29 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -31,15 +31,20 @@ const MONGO_IMAGE_TAG: &str = "5.0.11-focal";
 const OF_WATCHDOG_PORT: u16 = 8080;
 const DEVTOOL_PORT: u16 = 4000;
 const MONGO_PORT: u16 = 27017;
+const POSTGRES_PORT: u16 = 5432;
 
 /// Generates the docker-compose.yml file
-pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>) {
-    let compose_content = generate_docker_compose_content(dockerfile, dev_conf);
+pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>, expose: bool) {
+    let compose_content = generate_docker_compose_content(dockerfile, dev_conf, expose);
     let compose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
     fs::write(compose_path, compose_content).expect("Unable to write the docker-compose file");
 }
 
-fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>) -> String {
+fn generate_docker_compose_content(
+    dockerfile: PathBuf,
+    dev_conf: &Option<Dev>,
+    expose: bool,
+) -> String {
     let mut devtool_env_vec: Vec<(String, Option<String>)> = vec![
         ("POSTGRES_USER".to_string(), Some("postgres".to_string())),
         (
@@ -132,6 +137,7 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                     APP_SERVICE_NAME.into(),
                     Some(Service {
                         image: Some(service_images.app),
+                        ports: if expose { Some(vec![format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT)])} else {None},
                         build_: Some(BuildStep::Advanced(AdvancedBuildStep {
                             context: "..".into(),
                             dockerfile: Some(dockerfile.to_str().unwrap().into()),
@@ -189,41 +195,46 @@ fn generate_docker_compose_content(dockerfile: PathBuf, dev_conf: &Option<Dev>)
                 ),
                 (
                     POSTGRES_SERVICE_NAME.into(),
-                    Some(Service {
-                        image: Some(service_images.postgres),
-                        environment: Some(Environment::KvPair(postgres_envs.into())),
-                        healthcheck: Some(Healthcheck {
-                            test: Some(HealthcheckTest::Multiple(vec![
-                                "CMD".into(),
-                                "pg_isready".into(),
-                                "-U".into(),
-                                "postgres".into(),
-                            ])),
-                            start_period: Some("10s".into()),
-                            interval: Some("5s".into()),
-                            timeout: None,
-                            retries: 5,
-                            disable: false,
-                        }),
-                        ..Default::default()
-                    }),
+                    Some(
+                        Service {
+                            image: Some(service_images.postgres),
+                            ports: if expose {Some(vec![format!("{}:{}", POSTGRES_PORT, POSTGRES_PORT)])} else {None},
+                            environment: Some(Environment::KvPair(postgres_envs.into())),
+                            healthcheck: Some(Healthcheck {
+                                test: Some(HealthcheckTest::Multiple(vec![
+                                    "CMD".into(),
+                                    "pg_isready".into(),
+                                    "-U".into(),
+                                    "postgres".into(),
+                                ])),
+                                start_period: Some("10s".into()),
+                                interval: Some("5s".into()),
+                                timeout: None,
+                                retries: 5,
+                                disable: false,
+                            }),
+                            ..Default::default()
+                        }
+                   ),
                 ),
                 (
                     MONGO_SERVICE_NAME.into(),
-                    Some(Service {
-                        image: Some(service_images.mongo),
-                        environment: Some(Environment::KvPair(mongo_envs.into())),
-                        healthcheck: Some(Healthcheck {
-                            test: Some(HealthcheckTest::Single(r#"test $$(echo "rs.initiate($$CONFIG).ok || rs.status().ok" | mongo --quiet) -eq 1"#.to_string())),
-                            start_period: Some("10s".into()),
-                            interval: Some("5s".into()),
-                            timeout: None,
-                            retries: 5,
-                            disable: false,
-                        }),
-                        command: Some(Command::Simple("mongod --replSet rs0".into())),
-                        ..Default::default()
-                    }),
+                    Some( Service {
+                            image: Some(service_images.mongo),
+                            ports: if expose {Some(vec![format!("{}:{}", MONGO_PORT, MONGO_PORT)])} else {None},
+                            environment: Some(Environment::KvPair(mongo_envs.into())),
+                            healthcheck: Some(Healthcheck {
+                                test: Some(HealthcheckTest::Single(r#"test $$(echo "rs.initiate($$CONFIG).ok || rs.status().ok" | mongo --quiet) -eq 1"#.to_string())),
+                                start_period: Some("10s".into()),
+                                interval: Some("5s".into()),
+                                timeout: None,
+                                retries: 5,
+                                disable: false,
+                            }),
+                            command: Some(Command::Simple("mongod --replSet rs0".into())),
+                            ..Default::default()
+                        }
+                    ),
                 ),
             ]
             .into(),

From 63905397cdf1497675eaebbd2df2589f4ad4bfb7 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 11 Oct 2022 13:26:17 +0200
Subject: [PATCH 17/76] feat: Create the dev sub-command (#40)

---
 README.md        | 38 ++++++++++++++++++++++++++++++++++++++
 src/cli/build.rs |  2 +-
 src/cli/dev.rs   | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/cli/logs.rs  | 14 +++++++-------
 src/cli/mod.rs   |  6 +++++-
 src/cli/start.rs |  2 +-
 6 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 src/cli/dev.rs

diff --git a/README.md b/README.md
index a787deb..78022fa 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,9 @@ OPTIONS:
 
 SUBCOMMANDS:
     build    Build your app in release mode
+    dev      Starts the dev mode
     help     Print this message or the help of the given subcommand(s)
+    init     Generates dockerfile and docker compose file with the init command
     logs     View output from the containers
     new      Create a new Lenra app project
     start    Start your app previously built with the build command
@@ -103,6 +105,8 @@ This tools contains many subcommands to help you doing what you need.
 - [start](#start): starts your app previously built with the build command
 - [logs](#logs): displays output from the containers
 - [stop](#stop): stops your app previously started with the start command
+- [dev](#dev): starts your app in dev mode
+- [init](#init): Generates Docker and Docker Compose files
 
 #### new
 
@@ -212,6 +216,40 @@ OPTIONS:
     -h, --help               Print help information
 ```
 
+#### dev
+
+This subcommand starts the Lenra app of the current directory in dev mode.
+
+```bash
+$ lenra dev --help
+lenra-dev 
+Starts the dev mode
+
+USAGE:
+    lenra dev [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
+
+#### init
+
+This subcommand generates Docker and Docker Compose files.
+
+```bash
+$ lenra init --help
+lenra-init 
+Generates dockerfile and docker compose file with the init command
+
+USAGE:
+    lenra init [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
+
 ### Configuration file
 
 The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
diff --git a/src/cli/build.rs b/src/cli/build.rs
index b495e1b..07cf58b 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -6,7 +6,7 @@ use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
 use crate::docker_compose::compose_build;
 
-#[derive(clap::Args)]
+#[derive(clap::Args, Default)]
 pub struct Build {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
diff --git a/src/cli/dev.rs b/src/cli/dev.rs
new file mode 100644
index 0000000..4441508
--- /dev/null
+++ b/src/cli/dev.rs
@@ -0,0 +1,42 @@
+pub use clap::Args;
+
+use crate::cli::build::Build;
+use crate::cli::logs::{Logs, Service};
+use crate::cli::start::Start;
+use crate::cli::CliCommand;
+use crate::config::DEFAULT_CONFIG_FILE;
+
+#[derive(Args)]
+pub struct Dev {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+}
+
+impl CliCommand for Dev {
+    fn run(&self) {
+        log::info!("Run dev mode");
+
+        let build = Build {
+            config: self.config.clone(),
+            ..Default::default()
+        };
+        log::debug!("Run build");
+        build.run();
+
+        let start = Start {
+            config: self.config.clone(),
+            ..Default::default()
+        };
+        log::debug!("Run start");
+        start.run();
+
+        let logs = Logs {
+            services: vec![Service::App],
+            follow: true,
+            ..Default::default()
+        };
+        log::debug!("Run logs");
+        logs.run();
+    }
+}
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index dd20cb3..6c5eb57 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -8,19 +8,19 @@ use crate::docker_compose::{
     POSTGRES_SERVICE_NAME,
 };
 
-#[derive(Args)]
+#[derive(Args, Default)]
 pub struct Logs {
     /// Follow log output
     #[clap(short, long, action)]
-    follow: bool,
+    pub follow: bool,
 
     /// Produce monochrome output
     #[clap(long, action)]
-    no_color: bool,
+    pub no_color: bool,
 
     /// Don't print prefix in logs
     #[clap(long, action)]
-    no_log_prefix: bool,
+    pub no_log_prefix: bool,
 
     /// Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)
     #[clap(long)]
@@ -32,7 +32,7 @@ pub struct Logs {
 
     /// Show timestamps
     #[clap(short, long, action)]
-    timestamps: bool,
+    pub timestamps: bool,
 
     /// Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)
     #[clap(long)]
@@ -40,11 +40,11 @@ pub struct Logs {
 
     /// The logged service list
     #[clap(value_enum, default_value = "app")]
-    services: Vec<Service>,
+    pub services: Vec<Service>,
 }
 
 #[derive(clap::ValueEnum, Clone, Debug)]
-enum Service {
+pub enum Service {
     App,
     Devtool,
     Postgres,
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index af2cff0..47804d3 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,8 +1,9 @@
 pub use clap::{Args, Parser, Subcommand};
 
-use self::{build::Build, init::Init, logs::Logs, new::New, start::Start, stop::Stop};
+use self::{build::Build, dev::Dev, init::Init, logs::Logs, new::New, start::Start, stop::Stop};
 
 mod build;
+mod dev;
 mod init;
 mod logs;
 mod new;
@@ -34,6 +35,8 @@ pub enum Command {
     Logs(Logs),
     /// Stop your app previously started with the start command
     Stop(Stop),
+    /// Starts the dev mode
+    Dev(Dev),
     /// Generates dockerfile and docker compose file with the init command
     Init(Init),
 }
@@ -46,6 +49,7 @@ impl CliCommand for Command {
             Command::Start(start) => start.run(),
             Command::Logs(logs) => logs.run(),
             Command::Stop(stop) => stop.run(),
+            Command::Dev(dev) => dev.run(),
             Command::Init(init) => init.run(),
         };
     }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index 1f1cdf6..ef88643 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -6,7 +6,7 @@ use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
 use crate::docker_compose::{compose_up, execute_compose_service_command, DEVTOOL_SERVICE_NAME};
 
-#[derive(Args)]
+#[derive(Args, Default)]
 pub struct Start {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]

From db0a2a3f78d727d39eba8451f2d7cae9540a2128 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Wed, 12 Oct 2022 11:23:55 +0200
Subject: [PATCH 18/76] feat: Use Ctrl + C to stop dev mode properly (#41)

---
 Cargo.lock            | 23 +++++++++++++++++++++++
 Cargo.toml            |  1 +
 src/cli/dev.rs        | 16 +++++++++++++++-
 src/cli/logs.rs       | 29 ++++-------------------------
 src/docker_compose.rs | 34 +++++++++++++++++++++++++++-------
 5 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0a21c5f..46df9f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,6 +79,16 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "ctrlc"
+version = "3.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
+dependencies = [
+ "nix",
+ "winapi",
+]
+
 [[package]]
 name = "darling"
 version = "0.14.1"
@@ -249,6 +259,7 @@ name = "lenra_cli"
 version = "0.0.0"
 dependencies = [
  "clap",
+ "ctrlc",
  "docker-compose-types",
  "dofigen",
  "env_logger",
@@ -288,6 +299,18 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "nix"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+dependencies = [
+ "autocfg",
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.15.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1c492bd..476e9cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,3 +31,4 @@ lazy_static = "1.4.0"
 dofigen = "1"
 docker-compose-types = "0.2.2"
 open = "1"
+ctrlc = "3.2.3"
diff --git a/src/cli/dev.rs b/src/cli/dev.rs
index 4441508..f176ed0 100644
--- a/src/cli/dev.rs
+++ b/src/cli/dev.rs
@@ -1,10 +1,13 @@
 pub use clap::Args;
+use log::debug;
 
 use crate::cli::build::Build;
-use crate::cli::logs::{Logs, Service};
+use crate::cli::logs::Logs;
 use crate::cli::start::Start;
+use crate::cli::stop::Stop;
 use crate::cli::CliCommand;
 use crate::config::DEFAULT_CONFIG_FILE;
+use crate::docker_compose::Service;
 
 #[derive(Args)]
 pub struct Dev {
@@ -31,6 +34,11 @@ impl CliCommand for Dev {
         log::debug!("Run start");
         start.run();
 
+        ctrlc::set_handler(move || {
+            debug!("Stop asked");
+        })
+        .expect("Error setting Ctrl-C handler");
+
         let logs = Logs {
             services: vec![Service::App],
             follow: true,
@@ -38,5 +46,11 @@ impl CliCommand for Dev {
         };
         log::debug!("Run logs");
         logs.run();
+
+        let stop = Stop;
+        log::debug!("Run stop");
+        stop.run();
+
+        log::debug!("End of dev mode");
     }
 }
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index 6c5eb57..c3e8db9 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -1,12 +1,10 @@
 use std::process::Stdio;
 
 pub use clap::Args;
+use log::warn;
 
 use crate::cli::CliCommand;
-use crate::docker_compose::{
-    create_compose_command, APP_SERVICE_NAME, DEVTOOL_SERVICE_NAME, MONGO_SERVICE_NAME,
-    POSTGRES_SERVICE_NAME,
-};
+use crate::docker_compose::{create_compose_command, Service};
 
 #[derive(Args, Default)]
 pub struct Logs {
@@ -43,25 +41,6 @@ pub struct Logs {
     pub services: Vec<Service>,
 }
 
-#[derive(clap::ValueEnum, Clone, Debug)]
-pub enum Service {
-    App,
-    Devtool,
-    Postgres,
-    Mongo,
-}
-
-impl Service {
-    fn to_str(&self) -> &str {
-        match self {
-            Service::App => APP_SERVICE_NAME,
-            Service::Devtool => DEVTOOL_SERVICE_NAME,
-            Service::Postgres => POSTGRES_SERVICE_NAME,
-            Service::Mongo => MONGO_SERVICE_NAME,
-        }
-    }
-}
-
 impl CliCommand for Logs {
     fn run(&self) {
         log::info!("Show logs");
@@ -103,8 +82,8 @@ impl CliCommand for Logs {
             .expect("Failed to logs the docker-compose app");
 
         if !output.status.success() {
-            panic!(
-                "An error occured while stoping the docker-compose app:\n{}\n{}",
+            warn!(
+                "An error occured while displaying the docker-compose logs:\n{}\n{}",
                 String::from_utf8(output.stdout).unwrap(),
                 String::from_utf8(output.stderr).unwrap()
             )
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 7638d29..adeb7c1 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -7,8 +7,9 @@ use std::{
 
 use docker_compose_types::{
     AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions,
-    Environment, Healthcheck, HealthcheckTest, Service, Services,
+    Environment, Healthcheck, HealthcheckTest, Services,
 };
+use log::warn;
 
 use crate::{
     config::{Dev, DOCKERCOMPOSE_DEFAULT_PATH},
@@ -135,7 +136,7 @@ fn generate_docker_compose_content(
             [
                 (
                     APP_SERVICE_NAME.into(),
-                    Some(Service {
+                    Some(docker_compose_types::Service {
                         image: Some(service_images.app),
                         ports: if expose { Some(vec![format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT)])} else {None},
                         build_: Some(BuildStep::Advanced(AdvancedBuildStep {
@@ -158,7 +159,7 @@ fn generate_docker_compose_content(
                 ),
                 (
                     DEVTOOL_SERVICE_NAME.into(),
-                    Some(Service {
+                    Some(docker_compose_types::Service {
                         image: Some(service_images.devtool),
                         ports: Some(vec![format!("{}:{}", DEVTOOL_PORT, DEVTOOL_PORT)]),
                         environment: Some(Environment::KvPair(devtool_envs.into())),
@@ -196,7 +197,7 @@ fn generate_docker_compose_content(
                 (
                     POSTGRES_SERVICE_NAME.into(),
                     Some(
-                        Service {
+                        docker_compose_types::Service {
                             image: Some(service_images.postgres),
                             ports: if expose {Some(vec![format!("{}:{}", POSTGRES_PORT, POSTGRES_PORT)])} else {None},
                             environment: Some(Environment::KvPair(postgres_envs.into())),
@@ -219,7 +220,7 @@ fn generate_docker_compose_content(
                 ),
                 (
                     MONGO_SERVICE_NAME.into(),
-                    Some( Service {
+                    Some( docker_compose_types::Service {
                             image: Some(service_images.mongo),
                             ports: if expose {Some(vec![format!("{}:{}", MONGO_PORT, MONGO_PORT)])} else {None},
                             environment: Some(Environment::KvPair(mongo_envs.into())),
@@ -268,7 +269,7 @@ pub fn compose_up() {
         .expect("Failed to start the docker-compose app");
 
     if !output.status.success() {
-        panic!(
+        warn!(
             "An error occured while running the docker-compose app:\n{}\n{}",
             String::from_utf8(output.stdout).unwrap(),
             String::from_utf8(output.stderr).unwrap()
@@ -289,7 +290,7 @@ pub fn compose_build() {
     log::debug!("Build: {:?}", command);
     let output = command.output().expect("Failed building the Docker image");
     if !output.status.success() {
-        panic!(
+        warn!(
             "An error occured while building the Docker image:\n{}\n{}",
             String::from_utf8(output.stdout).unwrap(),
             String::from_utf8(output.stderr).unwrap()
@@ -350,6 +351,25 @@ fn current_dir_name() -> Option<String> {
     }
 }
 
+#[derive(clap::ValueEnum, Clone, Debug)]
+pub enum Service {
+    App,
+    Devtool,
+    Postgres,
+    Mongo,
+}
+
+impl Service {
+    pub fn to_str(&self) -> &str {
+        match self {
+            Service::App => APP_SERVICE_NAME,
+            Service::Devtool => DEVTOOL_SERVICE_NAME,
+            Service::Postgres => POSTGRES_SERVICE_NAME,
+            Service::Mongo => MONGO_SERVICE_NAME,
+        }
+    }
+}
+
 struct ServiceImages {
     app: String,
     devtool: String,

From 28a8a311d98dcabbd6fc5afbb40c42680350af3d Mon Sep 17 00:00:00 2001
From: Emric Pichonnier <emric.pichonnier@lenra.me>
Date: Wed, 12 Oct 2022 17:26:25 +0200
Subject: [PATCH 19/76] feat: reduce healthcheck (#39)

Co-authored-by: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Co-authored-by: Thomas DA ROCHA <thomas.darocha@lenra.io>
---
 src/cli/start.rs      | 11 ++++++++---
 src/docker_compose.rs | 39 ++++++++-------------------------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/cli/start.rs b/src/cli/start.rs
index ef88643..5607eaf 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -4,7 +4,9 @@ pub use clap::Args;
 
 use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
-use crate::docker_compose::{compose_up, execute_compose_service_command, DEVTOOL_SERVICE_NAME};
+use crate::docker_compose::{
+    self, compose_up, execute_compose_service_command, DEVTOOL_SERVICE_NAME,
+};
 
 #[derive(Args, Default)]
 pub struct Start {
@@ -19,10 +21,10 @@ pub struct Start {
 impl CliCommand for Start {
     fn run(&self) {
         log::info!("Starting the app");
+        let conf = load_config_file(&self.config);
 
         let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
         if !dockercompose_path.exists() {
-            let conf = load_config_file(&self.config);
             // TODO: check the components API version
 
             conf.generate_files(self.expose);
@@ -43,6 +45,9 @@ impl CliCommand for Start {
             log::info!("{}", error);
         }
         // Open the app
-        open::that("http://localhost:4000").unwrap();
+        println!(
+            "Application available at http://localhost:{}",
+            docker_compose::DEVTOOL_PORT
+        );
     }
 }
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index adeb7c1..869d776 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -29,10 +29,10 @@ const POSTGRES_IMAGE: &str = "postgres";
 const POSTGRES_IMAGE_TAG: &str = "13";
 const MONGO_IMAGE: &str = "mongo";
 const MONGO_IMAGE_TAG: &str = "5.0.11-focal";
-const OF_WATCHDOG_PORT: u16 = 8080;
-const DEVTOOL_PORT: u16 = 4000;
-const MONGO_PORT: u16 = 27017;
-const POSTGRES_PORT: u16 = 5432;
+pub const OF_WATCHDOG_PORT: u16 = 8080;
+pub const DEVTOOL_PORT: u16 = 4000;
+pub const MONGO_PORT: u16 = 27017;
+pub const POSTGRES_PORT: u16 = 5432;
 
 /// Generates the docker-compose.yml file
 pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>, expose: bool) {
@@ -144,15 +144,6 @@ fn generate_docker_compose_content(
                             dockerfile: Some(dockerfile.to_str().unwrap().into()),
                             ..Default::default()
                         })),
-                        depends_on: Some(DependsOnOptions::Conditional(
-                            [(
-                                DEVTOOL_SERVICE_NAME.into(),
-                                DependsCondition {
-                                    condition: "service_healthy".into(),
-                                },
-                            )]
-                            .into(),
-                        )),
                         // TODO: Add resources management  when managed by the docker-compose-types lib
                         ..Default::default()
                     }),
@@ -177,20 +168,6 @@ fn generate_docker_compose_content(
                             )]
                             .into(),
                         )),
-                        healthcheck: Some(Healthcheck {
-                            test: Some(HealthcheckTest::Multiple(vec![
-                                "CMD".into(),
-                                "wget".into(),
-                                "--spider".into(),
-                                "-q".into(),
-                                "http://localhost:4000".into(),
-                            ])),
-                            interval: Some("10s".into()),
-                            start_period: Some("5s".into()),
-                            timeout: Some("2s".into()),
-                            retries: 5,
-                            disable: false,
-                        }),
                         ..Default::default()
                     }),
                 ),
@@ -208,8 +185,8 @@ fn generate_docker_compose_content(
                                     "-U".into(),
                                     "postgres".into(),
                                 ])),
-                                start_period: Some("10s".into()),
-                                interval: Some("5s".into()),
+                                start_period: Some("5s".into()),
+                                interval: Some("1s".into()),
                                 timeout: None,
                                 retries: 5,
                                 disable: false,
@@ -226,8 +203,8 @@ fn generate_docker_compose_content(
                             environment: Some(Environment::KvPair(mongo_envs.into())),
                             healthcheck: Some(Healthcheck {
                                 test: Some(HealthcheckTest::Single(r#"test $$(echo "rs.initiate($$CONFIG).ok || rs.status().ok" | mongo --quiet) -eq 1"#.to_string())),
-                                start_period: Some("10s".into()),
-                                interval: Some("5s".into()),
+                                start_period: Some("5s".into()),
+                                interval: Some("1s".into()),
                                 timeout: None,
                                 retries: 5,
                                 disable: false,

From d7a83ec637defa04cfd8bf7602ee06f58d5b0d8f Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 14 Oct 2022 17:29:13 +0200
Subject: [PATCH 20/76] feat: Handle interactive commands (#42)

---
 Cargo.lock             | 305 ++++++++++++++++++++++++++++++++++++++++-
 Cargo.toml             |   2 +
 README.md              |   7 +-
 src/cli/build.rs       |   1 +
 src/cli/dev.rs         |  12 ++
 src/cli/interactive.rs | 106 ++++++++++++++
 src/cli/mod.rs         |   3 +-
 src/cli/start.rs       |   1 +
 8 files changed, 433 insertions(+), 4 deletions(-)
 create mode 100644 src/cli/interactive.rs

diff --git a/Cargo.lock b/Cargo.lock
index 46df9f2..426b45e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,6 +34,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "cc"
+version = "1.0.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -79,13 +85,24 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "clipboard-win"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219"
+dependencies = [
+ "error-code",
+ "str-buf",
+ "winapi",
+]
+
 [[package]]
 name = "ctrlc"
 version = "3.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
 dependencies = [
- "nix",
+ "nix 0.25.0",
  "winapi",
 ]
 
@@ -155,6 +172,47 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "docker-compose-types"
 version = "0.2.3"
@@ -179,6 +237,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
 [[package]]
 name = "env_logger"
 version = "0.9.1"
@@ -192,12 +256,65 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "error-code"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
+dependencies = [
+ "libc",
+ "str-buf",
+]
+
+[[package]]
+name = "fd-lock"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517"
+dependencies = [
+ "cfg-if",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "getrandom"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -242,6 +359,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
+
 [[package]]
 name = "itoa"
 version = "1.0.3"
@@ -260,6 +383,7 @@ version = "0.0.0"
 dependencies = [
  "clap",
  "ctrlc",
+ "dirs",
  "docker-compose-types",
  "dofigen",
  "env_logger",
@@ -267,6 +391,7 @@ dependencies = [
  "log",
  "open",
  "regex",
+ "rustyline",
  "serde",
  "serde_json",
  "serde_yaml 0.9.13",
@@ -284,6 +409,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.0.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -299,6 +430,26 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "nix"
 version = "0.25.0"
@@ -381,6 +532,36 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "thiserror",
+]
+
 [[package]]
 name = "regex"
 version = "1.6.0"
@@ -398,12 +579,55 @@ version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
+[[package]]
+name = "rustix"
+version = "0.35.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustyline"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "clipboard-win",
+ "dirs-next",
+ "fd-lock",
+ "libc",
+ "log",
+ "memchr",
+ "nix 0.24.2",
+ "radix_trie",
+ "scopeguard",
+ "unicode-segmentation",
+ "unicode-width",
+ "utf8parse",
+ "winapi",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
 [[package]]
 name = "serde"
 version = "1.0.145"
@@ -460,6 +684,18 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "str-buf"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -518,18 +754,42 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -561,6 +821,49 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
diff --git a/Cargo.toml b/Cargo.toml
index 476e9cd..e3a34ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,3 +32,5 @@ dofigen = "1"
 docker-compose-types = "0.2.2"
 open = "1"
 ctrlc = "3.2.3"
+rustyline = "10.0.0"
+dirs = "4.0.0"
diff --git a/README.md b/README.md
index 78022fa..91cc0ec 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ OPTIONS:
 
 SUBCOMMANDS:
     build    Build your app in release mode
-    dev      Starts the dev mode
+    dev      Start the app in an interactive mode
     help     Print this message or the help of the given subcommand(s)
     init     Generates dockerfile and docker compose file with the init command
     logs     View output from the containers
@@ -149,6 +149,7 @@ USAGE:
 
 OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose             Exposes all services ports
     -h, --help               Print help information
 ```
 
@@ -166,6 +167,7 @@ USAGE:
 
 OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose             Exposes all services ports
     -h, --help               Print help information
 ```
 
@@ -223,13 +225,14 @@ This subcommand starts the Lenra app of the current directory in dev mode.
 ```bash
 $ lenra dev --help
 lenra-dev 
-Starts the dev mode
+Start the app in an interactive mode
 
 USAGE:
     lenra dev [OPTIONS]
 
 OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose             Exposes all services ports
     -h, --help               Print help information
 ```
 
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 07cf58b..0839ad1 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -12,6 +12,7 @@ pub struct Build {
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 
+    /// Exposes all services ports.
     #[clap(long, action)]
     pub expose: bool,
 }
diff --git a/src/cli/dev.rs b/src/cli/dev.rs
index f176ed0..0adff6b 100644
--- a/src/cli/dev.rs
+++ b/src/cli/dev.rs
@@ -2,6 +2,7 @@ pub use clap::Args;
 use log::debug;
 
 use crate::cli::build::Build;
+use crate::cli::interactive::run_interactive_command;
 use crate::cli::logs::Logs;
 use crate::cli::start::Start;
 use crate::cli::stop::Stop;
@@ -14,6 +15,10 @@ pub struct Dev {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
+
+    /// Exposes all services ports.
+    #[clap(long, action)]
+    pub expose: bool,
 }
 
 impl CliCommand for Dev {
@@ -22,6 +27,7 @@ impl CliCommand for Dev {
 
         let build = Build {
             config: self.config.clone(),
+            expose: self.expose,
             ..Default::default()
         };
         log::debug!("Run build");
@@ -29,6 +35,7 @@ impl CliCommand for Dev {
 
         let start = Start {
             config: self.config.clone(),
+            expose: self.expose,
             ..Default::default()
         };
         log::debug!("Run start");
@@ -47,6 +54,11 @@ impl CliCommand for Dev {
         log::debug!("Run logs");
         logs.run();
 
+        let res = run_interactive_command();
+        if let Err(error) = res {
+            println!("An error occured: {}", error.to_string());
+        }
+
         let stop = Stop;
         log::debug!("Run stop");
         stop.run();
diff --git a/src/cli/interactive.rs b/src/cli/interactive.rs
new file mode 100644
index 0000000..45b685c
--- /dev/null
+++ b/src/cli/interactive.rs
@@ -0,0 +1,106 @@
+use std::fs;
+
+pub use clap::{Args, Parser, Subcommand};
+use clap::{CommandFactory, FromArgMatches};
+use dirs::config_dir;
+use log::debug;
+use rustyline::{error::ReadlineError, Editor};
+
+use super::{logs::Logs, stop::Stop, CliCommand};
+
+const LENRA_COMMAND: &str = "lenra";
+const READLINE_PROMPT: &str = "[lenra]$ ";
+
+pub fn run_interactive_command() -> Result<(), ReadlineError> {
+    let history_path = config_dir()
+        .expect("Can't get the user config directory")
+        .join("lenra")
+        .join("dev.history");
+    let mut rl = Editor::<()>::new()?;
+
+    debug!("Load history from {:?}", history_path);
+    if rl.load_history(&history_path).is_err() {
+        debug!("No previous history.");
+    }
+
+    loop {
+        let readline = rl.readline(READLINE_PROMPT);
+        match readline {
+            Ok(line) => {
+                rl.add_history_entry(line.as_str());
+                let result = parse_command_line(line);
+
+                match result {
+                    Ok(interactive) => interactive.command.run(),
+                    Err(e) => {
+                        e.print().expect("Could not print error");
+                    }
+                }
+            }
+            Err(ReadlineError::Interrupted) => {
+                debug!("CTRL-C");
+                break;
+            }
+            Err(ReadlineError::Eof) => {
+                debug!("CTRL-D");
+                break;
+            }
+            Err(err) => {
+                println!("Error: {:?}", err);
+                break;
+            }
+        }
+    }
+    debug!("Save history to {:?}", history_path);
+    fs::create_dir_all(history_path.parent().unwrap())?;
+    rl.save_history(&history_path)
+}
+
+fn parse_command_line(line: String) -> Result<Interactive, clap::Error> {
+    let args = &mut line.split_whitespace().collect::<Vec<&str>>();
+
+    let first_arg = if args.len() > 0 { Some(args[0]) } else { None };
+    if let Some(arg) = first_arg {
+        if LENRA_COMMAND != arg {
+            args.push(LENRA_COMMAND);
+            args.rotate_right(1);
+        }
+    }
+    let command = <Interactive as CommandFactory>::command();
+    let mut matches = command
+        .clone()
+        .try_get_matches_from(args.clone())
+        .map_err(format_error)?;
+    <Interactive as FromArgMatches>::from_arg_matches_mut(&mut matches).map_err(format_error)
+}
+
+fn format_error(err: clap::Error) -> clap::Error {
+    let mut command = <Interactive as CommandFactory>::command();
+    err.format(&mut command)
+}
+
+/// The Lenra interactive command line interface
+#[derive(Parser)]
+#[clap(rename_all = "kebab-case")]
+pub struct Interactive {
+    #[clap(subcommand)]
+    pub command: InteractiveCommand,
+}
+
+/// The interactive commands
+#[derive(Subcommand)]
+pub enum InteractiveCommand {
+    /// View output from the containers
+    Logs(Logs),
+    /// Stop your app previously started with the start command
+    Stop(Stop),
+}
+
+impl CliCommand for InteractiveCommand {
+    fn run(&self) {
+        match self {
+            InteractiveCommand::Logs(_logs) => println!("logs is not implemented yet"), //logs.run(),
+            InteractiveCommand::Stop(_stop) => println!("stop is not implemented yet"), //stop.run(),
+        };
+    }
+}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 47804d3..541dcc0 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -5,6 +5,7 @@ use self::{build::Build, dev::Dev, init::Init, logs::Logs, new::New, start::Star
 mod build;
 mod dev;
 mod init;
+mod interactive;
 mod logs;
 mod new;
 mod start;
@@ -35,7 +36,7 @@ pub enum Command {
     Logs(Logs),
     /// Stop your app previously started with the start command
     Stop(Stop),
-    /// Starts the dev mode
+    /// Start the app in an interactive mode
     Dev(Dev),
     /// Generates dockerfile and docker compose file with the init command
     Init(Init),
diff --git a/src/cli/start.rs b/src/cli/start.rs
index 5607eaf..b26d7af 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -14,6 +14,7 @@ pub struct Start {
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 
+    /// Exposes all services ports.
     #[clap(long, action)]
     pub expose: bool,
 }

From 4eac71596b989095a9b655bf8e2ad2b2659ea820 Mon Sep 17 00:00:00 2001
From: Emric Pichonnier <emric.pichonnier@lenra.me>
Date: Sat, 15 Oct 2022 10:15:02 +0200
Subject: [PATCH 21/76] feat: remove timeout (#43)

---
 src/config.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/config.rs b/src/config.rs
index a9b0c01..e8b15b8 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -190,6 +190,8 @@ impl Application {
             panic!("The Dofigen descriptor can't have entrypoint defined. Use cmd instead");
         }
 
+        envs.insert("exec_timeout".to_string(), "0".to_string());
+
         if let Some(cmd) = image.cmd {
             envs.insert("fprocess".to_string(), cmd.join(" "));
         } else {
@@ -255,7 +257,13 @@ mod dofigen_of_overlay_tests {
                 ..Default::default()
             }]),
             image: String::from("my-dockerimage"),
-            envs: Some([("fprocess".to_string(), "/app/my-app".to_string())].into()),
+            envs: Some(
+                [
+                    ("exec_timeout".to_string(), "0".to_string()),
+                    ("fprocess".to_string(), "/app/my-app".to_string()),
+                ]
+                .into(),
+            ),
             artifacts: Some(vec![Artifact {
                 builder: "of-watchdog".into(),
                 source: "/fwatchdog".into(),

From c1dd07cd1a6868ffe4bb4cf6660dab5be24fffa1 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:24:31 +0200
Subject: [PATCH 22/76] feat: Continue interactive command (#45)

Co-authored-by: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com>
---
 Cargo.lock             | 231 ++++++++++++++++++++++++++++++++++++++++-
 Cargo.toml             |   1 +
 README.md              |  50 +++++++++
 src/cli/dev.rs         |  10 --
 src/cli/interactive.rs |  44 +++++++-
 src/cli/logs.rs        |   2 +-
 src/cli/stop.rs        |   2 +-
 7 files changed, 324 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 426b45e..8c7052d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,6 +11,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -34,6 +43,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bumpalo"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+
 [[package]]
 name = "cc"
 version = "1.0.73"
@@ -46,6 +61,21 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "chrono"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-integer",
+ "num-traits",
+ "time",
+ "wasm-bindgen",
+ "winapi",
+]
+
 [[package]]
 name = "clap"
 version = "3.2.22"
@@ -96,6 +126,22 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
 [[package]]
 name = "ctrlc"
 version = "3.2.3"
@@ -106,6 +152,50 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "cxx"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07d050484b55975889284352b0ffc2ecbda25c0c55978017c132b29ba0818a86"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "darling"
 version = "0.14.1"
@@ -312,7 +402,7 @@ checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -342,6 +432,30 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -371,6 +485,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
 
+[[package]]
+name = "js-sys"
+version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -381,6 +504,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 name = "lenra_cli"
 version = "0.0.0"
 dependencies = [
+ "chrono",
  "clap",
  "ctrlc",
  "dirs",
@@ -403,6 +527,15 @@ version = "0.2.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
 
+[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -462,6 +595,25 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.15.0"
@@ -628,6 +780,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
 [[package]]
 name = "serde"
 version = "1.0.145"
@@ -748,6 +906,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.4"
@@ -784,12 +953,72 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/Cargo.toml b/Cargo.toml
index e3a34ce..cc62190 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,3 +34,4 @@ open = "1"
 ctrlc = "3.2.3"
 rustyline = "10.0.0"
 dirs = "4.0.0"
+chrono = "0.4.22"
diff --git a/README.md b/README.md
index 91cc0ec..868b157 100644
--- a/README.md
+++ b/README.md
@@ -253,6 +253,56 @@ OPTIONS:
     -h, --help               Print help information
 ```
 
+## dev interactive commands
+
+When using the [dev](#dev) sub-command, the CLI enters an interactive mode.
+The interactive mode builds and starts the app and then displays its logs.
+
+When the CLI receive a `Ctrl + C` signal in dev mode, it displays an interactive command prompt.
+Here is the `help` interactive command result:
+
+```bash
+[lenra]$ help
+lenra_cli 
+The Lenra interactive command line interface
+
+USAGE:
+    lenra <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    continue    Continue the previous logs command since the last displayed logs
+    help        Print this message or the help of the given subcommand(s)
+    logs        View output from the containers
+    stop        Stop your app previously started with the start command
+```
+
+### Subcommands
+
+This tools contains many subcommands to help you do what you need.
+
+- [continue](#continue): continues the previous logs command since the last displayed logs
+- [logs](#logs): displays output from the containers
+- [stop](#stop): stops your app previously started with the start command
+
+#### continue
+
+This subcommand continues the previous logs command since the last displayed logs.
+
+```bash
+[lenra]$ continue --help
+lenra-continue 
+Continue the previous logs command since the last displayed logs
+
+USAGE:
+    lenra continue
+
+OPTIONS:
+    -h, --help    Print help information
+```
+
 ### Configuration file
 
 The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
diff --git a/src/cli/dev.rs b/src/cli/dev.rs
index 0adff6b..05f5cbf 100644
--- a/src/cli/dev.rs
+++ b/src/cli/dev.rs
@@ -3,12 +3,10 @@ use log::debug;
 
 use crate::cli::build::Build;
 use crate::cli::interactive::run_interactive_command;
-use crate::cli::logs::Logs;
 use crate::cli::start::Start;
 use crate::cli::stop::Stop;
 use crate::cli::CliCommand;
 use crate::config::DEFAULT_CONFIG_FILE;
-use crate::docker_compose::Service;
 
 #[derive(Args)]
 pub struct Dev {
@@ -46,14 +44,6 @@ impl CliCommand for Dev {
         })
         .expect("Error setting Ctrl-C handler");
 
-        let logs = Logs {
-            services: vec![Service::App],
-            follow: true,
-            ..Default::default()
-        };
-        log::debug!("Run logs");
-        logs.run();
-
         let res = run_interactive_command();
         if let Err(error) = res {
             println!("An error occured: {}", error.to_string());
diff --git a/src/cli/interactive.rs b/src/cli/interactive.rs
index 45b685c..bd04c7c 100644
--- a/src/cli/interactive.rs
+++ b/src/cli/interactive.rs
@@ -1,11 +1,14 @@
 use std::fs;
 
+use chrono::{DateTime, SecondsFormat, Utc};
 pub use clap::{Args, Parser, Subcommand};
 use clap::{CommandFactory, FromArgMatches};
 use dirs::config_dir;
-use log::debug;
+use log::{debug, warn};
 use rustyline::{error::ReadlineError, Editor};
 
+use crate::docker_compose::Service;
+
 use super::{logs::Logs, stop::Stop, CliCommand};
 
 const LENRA_COMMAND: &str = "lenra";
@@ -23,6 +26,13 @@ pub fn run_interactive_command() -> Result<(), ReadlineError> {
         debug!("No previous history.");
     }
 
+    let mut previous_log = Logs {
+        services: vec![Service::App],
+        follow: true,
+        ..Default::default()
+    };
+    let mut last_logs = run_logs(&previous_log, None);
+
     loop {
         let readline = rl.readline(READLINE_PROMPT);
         match readline {
@@ -31,7 +41,20 @@ pub fn run_interactive_command() -> Result<(), ReadlineError> {
                 let result = parse_command_line(line);
 
                 match result {
-                    Ok(interactive) => interactive.command.run(),
+                    Ok(interactive) => {
+                        let logs_since = match interactive.command {
+                            InteractiveCommand::Continue => Some(last_logs),
+                            InteractiveCommand::Logs(logs) => {
+                                previous_log = logs.clone();
+                                None
+                            }
+                            cmd => {
+                                cmd.run();
+                                Some(last_logs)
+                            }
+                        };
+                        last_logs = run_logs(&previous_log, logs_since);
+                    }
                     Err(e) => {
                         e.print().expect("Could not print error");
                     }
@@ -56,6 +79,18 @@ pub fn run_interactive_command() -> Result<(), ReadlineError> {
     rl.save_history(&history_path)
 }
 
+fn run_logs(logs: &Logs, last_end: Option<DateTime<Utc>>) -> DateTime<Utc> {
+    let mut clone = logs.clone();
+    if let Some(last_logs) = last_end {
+        // Only displays new logs
+        clone.since = Some(last_logs.to_rfc3339_opts(SecondsFormat::Secs, true));
+        // Follows the logs
+        clone.follow = true;
+    }
+    clone.run();
+    Utc::now()
+}
+
 fn parse_command_line(line: String) -> Result<Interactive, clap::Error> {
     let args = &mut line.split_whitespace().collect::<Vec<&str>>();
 
@@ -88,8 +123,10 @@ pub struct Interactive {
 }
 
 /// The interactive commands
-#[derive(Subcommand)]
+#[derive(Subcommand, Clone)]
 pub enum InteractiveCommand {
+    /// Continue the previous logs command since the last displayed logs
+    Continue,
     /// View output from the containers
     Logs(Logs),
     /// Stop your app previously started with the start command
@@ -99,6 +136,7 @@ pub enum InteractiveCommand {
 impl CliCommand for InteractiveCommand {
     fn run(&self) {
         match self {
+            InteractiveCommand::Continue => warn!("The continue command should not be run"), //stop.run(),
             InteractiveCommand::Logs(_logs) => println!("logs is not implemented yet"), //logs.run(),
             InteractiveCommand::Stop(_stop) => println!("stop is not implemented yet"), //stop.run(),
         };
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index c3e8db9..1af7866 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -6,7 +6,7 @@ use log::warn;
 use crate::cli::CliCommand;
 use crate::docker_compose::{create_compose_command, Service};
 
-#[derive(Args, Default)]
+#[derive(Args, Default, Clone)]
 pub struct Logs {
     /// Follow log output
     #[clap(short, long, action)]
diff --git a/src/cli/stop.rs b/src/cli/stop.rs
index b4ae724..4e6b066 100644
--- a/src/cli/stop.rs
+++ b/src/cli/stop.rs
@@ -5,7 +5,7 @@ pub use clap::Args;
 use crate::cli::CliCommand;
 use crate::docker_compose::create_compose_command;
 
-#[derive(Args)]
+#[derive(Args, Clone)]
 pub struct Stop;
 
 impl CliCommand for Stop {

From 55481152df4ea2931421086006b95a5de14e4bfa Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 18 Oct 2022 16:39:18 +0200
Subject: [PATCH 23/76] feat: Interactive stop command (#44)

---
 src/cli/interactive.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cli/interactive.rs b/src/cli/interactive.rs
index bd04c7c..f3e0081 100644
--- a/src/cli/interactive.rs
+++ b/src/cli/interactive.rs
@@ -9,7 +9,7 @@ use rustyline::{error::ReadlineError, Editor};
 
 use crate::docker_compose::Service;
 
-use super::{logs::Logs, stop::Stop, CliCommand};
+use super::{logs::Logs, CliCommand};
 
 const LENRA_COMMAND: &str = "lenra";
 const READLINE_PROMPT: &str = "[lenra]$ ";
@@ -48,6 +48,7 @@ pub fn run_interactive_command() -> Result<(), ReadlineError> {
                                 previous_log = logs.clone();
                                 None
                             }
+                            InteractiveCommand::Stop => break,
                             cmd => {
                                 cmd.run();
                                 Some(last_logs)
@@ -130,15 +131,15 @@ pub enum InteractiveCommand {
     /// View output from the containers
     Logs(Logs),
     /// Stop your app previously started with the start command
-    Stop(Stop),
+    Stop,
 }
 
 impl CliCommand for InteractiveCommand {
     fn run(&self) {
         match self {
-            InteractiveCommand::Continue => warn!("The continue command should not be run"), //stop.run(),
-            InteractiveCommand::Logs(_logs) => println!("logs is not implemented yet"), //logs.run(),
-            InteractiveCommand::Stop(_stop) => println!("stop is not implemented yet"), //stop.run(),
+            InteractiveCommand::Continue => warn!("The continue command should not be run"),
+            InteractiveCommand::Logs(_logs) => println!("logs is not implemented yet"),
+            InteractiveCommand::Stop => warn!("The stop command should not be run"),
         };
     }
 }

From ab81d2423491b6fbd764f8807452bb96afde9426 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 18 Oct 2022 17:40:48 +0200
Subject: [PATCH 24/76] feat: Reload interactive command (#46)

---
 README.md              | 18 ++++++++++++++++++
 src/cli/dev.rs         |  7 +++++--
 src/cli/interactive.rs | 40 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 868b157..5ed0048 100644
--- a/README.md
+++ b/README.md
@@ -276,6 +276,7 @@ SUBCOMMANDS:
     continue    Continue the previous logs command since the last displayed logs
     help        Print this message or the help of the given subcommand(s)
     logs        View output from the containers
+    reload      Reload the by rebuilding and restarting it
     stop        Stop your app previously started with the start command
 ```
 
@@ -285,6 +286,7 @@ This tools contains many subcommands to help you do what you need.
 
 - [continue](#continue): continues the previous logs command since the last displayed logs
 - [logs](#logs): displays output from the containers
+- [reload](#reload): reloads the app by rebuilding and restarting it
 - [stop](#stop): stops your app previously started with the start command
 
 #### continue
@@ -303,6 +305,22 @@ OPTIONS:
     -h, --help    Print help information
 ```
 
+#### reload
+
+This subcommand reloads the app by rebuilding and restarting it.
+
+```bash
+[lenra]$ reload --help
+lenra-reload 
+Reload the app by rebuilding and restarting it
+
+USAGE:
+    lenra reload
+
+OPTIONS:
+    -h, --help    Print help information
+```
+
 ### Configuration file
 
 The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
diff --git a/src/cli/dev.rs b/src/cli/dev.rs
index 05f5cbf..bdae905 100644
--- a/src/cli/dev.rs
+++ b/src/cli/dev.rs
@@ -2,7 +2,7 @@ pub use clap::Args;
 use log::debug;
 
 use crate::cli::build::Build;
-use crate::cli::interactive::run_interactive_command;
+use crate::cli::interactive::{run_interactive_command, InteractiveContext};
 use crate::cli::start::Start;
 use crate::cli::stop::Stop;
 use crate::cli::CliCommand;
@@ -44,7 +44,10 @@ impl CliCommand for Dev {
         })
         .expect("Error setting Ctrl-C handler");
 
-        let res = run_interactive_command();
+        let res = run_interactive_command(&InteractiveContext {
+            config: self.config.clone(),
+            expose: self.expose,
+        });
         if let Err(error) = res {
             println!("An error occured: {}", error.to_string());
         }
diff --git a/src/cli/interactive.rs b/src/cli/interactive.rs
index f3e0081..e866603 100644
--- a/src/cli/interactive.rs
+++ b/src/cli/interactive.rs
@@ -7,14 +7,17 @@ use dirs::config_dir;
 use log::{debug, warn};
 use rustyline::{error::ReadlineError, Editor};
 
-use crate::docker_compose::Service;
+use crate::{
+    cli::{build::Build, start::Start},
+    docker_compose::Service,
+};
 
 use super::{logs::Logs, CliCommand};
 
 const LENRA_COMMAND: &str = "lenra";
 const READLINE_PROMPT: &str = "[lenra]$ ";
 
-pub fn run_interactive_command() -> Result<(), ReadlineError> {
+pub fn run_interactive_command(context: &InteractiveContext) -> Result<(), ReadlineError> {
     let history_path = config_dir()
         .expect("Can't get the user config directory")
         .join("lenra")
@@ -50,7 +53,7 @@ pub fn run_interactive_command() -> Result<(), ReadlineError> {
                             }
                             InteractiveCommand::Stop => break,
                             cmd => {
-                                cmd.run();
+                                cmd.run(context);
                                 Some(last_logs)
                             }
                         };
@@ -115,6 +118,14 @@ fn format_error(err: clap::Error) -> clap::Error {
     err.format(&mut command)
 }
 
+pub struct InteractiveContext {
+    /// The app configuration file.
+    pub config: std::path::PathBuf,
+
+    /// Exposes all services ports.
+    pub expose: bool,
+}
+
 /// The Lenra interactive command line interface
 #[derive(Parser)]
 #[clap(rename_all = "kebab-case")]
@@ -130,16 +141,35 @@ pub enum InteractiveCommand {
     Continue,
     /// View output from the containers
     Logs(Logs),
+    /// Reload the app by rebuilding and restarting it
+    Reload,
     /// Stop your app previously started with the start command
     Stop,
 }
 
-impl CliCommand for InteractiveCommand {
-    fn run(&self) {
+impl InteractiveCommand {
+    fn run(&self, context: &InteractiveContext) {
         match self {
             InteractiveCommand::Continue => warn!("The continue command should not be run"),
             InteractiveCommand::Logs(_logs) => println!("logs is not implemented yet"),
             InteractiveCommand::Stop => warn!("The stop command should not be run"),
+            InteractiveCommand::Reload => {
+                let build = Build {
+                    config: context.config.clone(),
+                    expose: context.expose,
+                    ..Default::default()
+                };
+                log::debug!("Run build");
+                build.run();
+
+                let start = Start {
+                    config: context.config.clone(),
+                    expose: context.expose,
+                    ..Default::default()
+                };
+                log::debug!("Run start");
+                start.run();
+            }
         };
     }
 }

From 38bf1725c7bf866778b00b58a0ee1f21d8abdea6 Mon Sep 17 00:00:00 2001
From: Emric Pichonnier <emric.pichonnier@lenra.me>
Date: Mon, 24 Oct 2022 17:51:32 +0200
Subject: [PATCH 25/76] feat: add devtool healthcheck (#49)

---
 src/docker_compose.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 869d776..caed259 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -154,6 +154,20 @@ fn generate_docker_compose_content(
                         image: Some(service_images.devtool),
                         ports: Some(vec![format!("{}:{}", DEVTOOL_PORT, DEVTOOL_PORT)]),
                         environment: Some(Environment::KvPair(devtool_envs.into())),
+                        healthcheck: Some(Healthcheck {
+                            test: Some(HealthcheckTest::Multiple(vec![
+                                "CMD".into(),
+                                "wget".into(),
+                                "--spider".into(),
+                                "-q".into(),
+                                "http://localhost:4000/health".into(),
+                            ])),
+                            start_period: Some("10s".into()),
+                            interval: Some("1s".into()),
+                            timeout: None,
+                            retries: 5,
+                            disable: false,
+                        }),
                         depends_on: Some(DependsOnOptions::Conditional(
                             [(
                                 POSTGRES_SERVICE_NAME.into(),
@@ -237,6 +251,7 @@ pub fn compose_up() {
     command
         .arg("up")
         .arg("-d")
+        .arg("--wait")
         .stdout(Stdio::inherit())
         .stderr(Stdio::inherit());
 

From 18fcaa898db49cad39abf20c503b3f723f853ede Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Wed, 26 Oct 2022 16:20:24 +0200
Subject: [PATCH 26/76] feat: Update Docker images command (#50)

---
 Cargo.lock            |   1 +
 Cargo.toml            |   1 +
 README.md             |  41 ++++++++++++----
 src/cli/build.rs      |   2 +-
 src/cli/init.rs       |   2 +-
 src/cli/mod.rs        |   9 +++-
 src/cli/start.rs      |   2 +-
 src/cli/update.rs     |  55 ++++++++++++++++++++++
 src/config.rs         |  30 ++++++++----
 src/docker.rs         |   9 ++++
 src/docker_compose.rs | 107 +++++++++++++++++++++++-------------------
 src/errors.rs         |  15 ++++++
 src/main.rs           |   2 +
 13 files changed, 208 insertions(+), 68 deletions(-)
 create mode 100644 src/cli/update.rs
 create mode 100644 src/docker.rs
 create mode 100644 src/errors.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8c7052d..ba89d32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -519,6 +519,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml 0.9.13",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index cc62190..e0b208a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,3 +35,4 @@ ctrlc = "3.2.3"
 rustyline = "10.0.0"
 dirs = "4.0.0"
 chrono = "0.4.22"
+thiserror = "1.0.37"
diff --git a/README.md b/README.md
index 5ed0048..13cb0c2 100644
--- a/README.md
+++ b/README.md
@@ -86,14 +86,15 @@ OPTIONS:
     -V, --version    Print version information
 
 SUBCOMMANDS:
-    build    Build your app in release mode
-    dev      Start the app in an interactive mode
-    help     Print this message or the help of the given subcommand(s)
-    init     Generates dockerfile and docker compose file with the init command
-    logs     View output from the containers
-    new      Create a new Lenra app project
-    start    Start your app previously built with the build command
-    stop     Stop your app previously started with the start command
+    build     Build your app in release mode
+    dev       Start the app in an interactive mode
+    help      Print this message or the help of the given subcommand(s)
+    init      Generates dockerfile and docker compose file with the init command
+    logs      View output from the containers
+    new       Create a new Lenra app project
+    start     Start your app previously built with the build command
+    stop      Stop your app previously started with the start command
+    update    Update the tools Docker images
 ```
 
 ### Subcommands
@@ -106,7 +107,8 @@ This tools contains many subcommands to help you doing what you need.
 - [logs](#logs): displays output from the containers
 - [stop](#stop): stops your app previously started with the start command
 - [dev](#dev): starts your app in dev mode
-- [init](#init): Generates Docker and Docker Compose files
+- [init](#init): generates Docker and Docker Compose files
+- [update](#update): updates the tools Docker images
 
 #### new
 
@@ -253,6 +255,27 @@ OPTIONS:
     -h, --help               Print help information
 ```
 
+#### update
+
+This subcommand updates the tools Docker images.
+
+```bash
+$ lenra update --help
+lenra-update 
+Update the tools Docker images
+
+USAGE:
+    lenra update [OPTIONS] [SERVICES]...
+
+ARGS:
+    <SERVICES>...    The service list to pull [default: devtool postgres mongo] [possible
+                     values: app, devtool, postgres, mongo]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
+
 ## dev interactive commands
 
 When using the [dev](#dev) sub-command, the CLI enters an interactive mode.
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 0839ad1..03dd95c 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -30,7 +30,7 @@ impl Build {
 
 impl CliCommand for Build {
     fn run(&self) {
-        let conf = load_config_file(&self.config);
+        let conf = load_config_file(&self.config).unwrap();
         // TODO: check the components API version
 
         conf.generate_files(self.expose);
diff --git a/src/cli/init.rs b/src/cli/init.rs
index 93607c1..d8b5d86 100644
--- a/src/cli/init.rs
+++ b/src/cli/init.rs
@@ -12,7 +12,7 @@ pub struct Init {
 
 impl CliCommand for Init {
     fn run(&self) {
-        let conf = load_config_file(&self.config);
+        let conf = load_config_file(&self.config).unwrap();
         // TODO: check the components API version
         conf.generate_docker_files();
     }
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 541dcc0..f1daa97 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,6 +1,9 @@
 pub use clap::{Args, Parser, Subcommand};
 
-use self::{build::Build, dev::Dev, init::Init, logs::Logs, new::New, start::Start, stop::Stop};
+use self::{
+    build::Build, dev::Dev, init::Init, logs::Logs, new::New, start::Start, stop::Stop,
+    update::Update,
+};
 
 mod build;
 mod dev;
@@ -10,6 +13,7 @@ mod logs;
 mod new;
 mod start;
 mod stop;
+mod update;
 
 /// The Lenra command line interface
 #[derive(Parser)]
@@ -40,6 +44,8 @@ pub enum Command {
     Dev(Dev),
     /// Generates dockerfile and docker compose file with the init command
     Init(Init),
+    /// Update the tools Docker images
+    Update(Update),
 }
 
 impl CliCommand for Command {
@@ -52,6 +58,7 @@ impl CliCommand for Command {
             Command::Stop(stop) => stop.run(),
             Command::Dev(dev) => dev.run(),
             Command::Init(init) => init.run(),
+            Command::Update(update) => update.run(),
         };
     }
 }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index b26d7af..517269e 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -22,7 +22,7 @@ pub struct Start {
 impl CliCommand for Start {
     fn run(&self) {
         log::info!("Starting the app");
-        let conf = load_config_file(&self.config);
+        let conf = load_config_file(&self.config).unwrap();
 
         let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
         if !dockercompose_path.exists() {
diff --git a/src/cli/update.rs b/src/cli/update.rs
new file mode 100644
index 0000000..f6db6f6
--- /dev/null
+++ b/src/cli/update.rs
@@ -0,0 +1,55 @@
+use std::process::Stdio;
+
+pub use clap::Args;
+
+use crate::cli::CliCommand;
+use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
+use crate::docker;
+use crate::docker_compose::{get_services_images, Service};
+
+#[derive(Args, Clone)]
+pub struct Update {
+    /// The app configuration file.
+    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+
+    /// The service list to pull
+    #[clap(value_enum, default_values = &["devtool", "postgres", "mongo"])]
+    pub services: Vec<Service>,
+}
+
+impl CliCommand for Update {
+    fn run(&self) {
+        log::info!("Updating Docker images");
+
+        let conf = load_config_file(&self.config).ok();
+        let dev_conf = if let Some(dev_opt) = conf.iter().map(|c| &c.dev).next() {
+            dev_opt
+        } else {
+            &None
+        };
+        let images = get_services_images(dev_conf);
+
+        let processes = self.services.iter().map(|service| {
+            docker::pull(service.get_image(&images))
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit())
+                .spawn()
+        });
+
+        processes.for_each(|p| {
+            let output = p
+                .expect("Failed to update the Docker image")
+                .wait_with_output()
+                .expect("Failed to get command output");
+
+            if !output.status.success() {
+                panic!(
+                    "An error occured while updating Docker image:\n{}\n{}",
+                    String::from_utf8(output.stdout).unwrap(),
+                    String::from_utf8(output.stderr).unwrap()
+                )
+            }
+        });
+    }
+}
diff --git a/src/config.rs b/src/config.rs
index e8b15b8..c8da5a6 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -6,7 +6,10 @@ use dofigen_lib::{
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 
-use crate::docker_compose::generate_docker_compose;
+use crate::{
+    docker_compose::generate_docker_compose,
+    errors::{Error, Result},
+};
 
 pub const DEFAULT_CONFIG_FILE: &str = "lenra.yml";
 pub const LENRA_CACHE_DIRECTORY: &str = ".lenra";
@@ -19,16 +22,27 @@ pub const OF_WATCHDOG_BUILDER: &str = "of-watchdog";
 pub const OF_WATCHDOG_IMAGE: &str = "ghcr.io/openfaas/of-watchdog";
 pub const OF_WATCHDOG_VERSION: &str = "0.9.6";
 
-pub fn load_config_file(path: &std::path::PathBuf) -> Application {
-    let file = fs::File::open(path).unwrap();
+pub fn load_config_file(path: &std::path::PathBuf) -> Result<Application> {
+    let file = fs::File::open(path).map_err(|err| Error::OpenFile(err))?;
     match path.extension() {
         Some(os_str) => match os_str.to_str() {
-            Some("yml" | "yaml") => serde_yaml::from_reader(file).unwrap(),
-            Some("json") => serde_json::from_reader(file).unwrap(),
-            Some(ext) => panic!("Not managed config file extension {}", ext),
-            None => panic!("The config file has no extension"),
+            Some("yml" | "yaml") => {
+                Ok(serde_yaml::from_reader(file).map_err(|err| Error::DeserializeYaml(err))?)
+            }
+            Some("json") => {
+                Ok(serde_json::from_reader(file).map_err(|err| Error::DeserializeJson(err))?)
+            }
+            Some(ext) => Err(Error::Custom(format!(
+                "Not managed config file extension {}",
+                ext
+            ))),
+            None => Err(Error::Custom(
+                "The config file has no extension".to_string(),
+            )),
         },
-        None => panic!("The config file has no extension"),
+        None => Err(Error::Custom(
+            "The config file has no extension".to_string(),
+        )),
     }
 }
 
diff --git a/src/docker.rs b/src/docker.rs
new file mode 100644
index 0000000..f89e874
--- /dev/null
+++ b/src/docker.rs
@@ -0,0 +1,9 @@
+use std::process;
+
+pub fn pull(image: String) -> process::Command {
+    let mut cmd = process::Command::new("docker");
+
+    cmd.arg("pull").arg(image);
+
+    cmd
+}
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index caed259..34fa01f 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -88,48 +88,7 @@ fn generate_docker_compose_content(
         ),
     ];
 
-    let default_app_image = current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string());
-    let default_app_tag = get_current_branch().unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
-
-    let service_images = if let Some(dev) = dev_conf {
-        ServiceImages {
-            app: format!(
-                "{}{}:{}",
-                APP_BASE_IMAGE,
-                dev.app_name.clone().unwrap_or(default_app_image),
-                dev.app_tag.clone().unwrap_or(default_app_tag)
-            ),
-            devtool: format!(
-                "{}:{}",
-                DEVTOOL_IMAGE,
-                dev.devtool_tag
-                    .clone()
-                    .unwrap_or(DEVTOOL_DEFAULT_TAG.to_string())
-            ),
-            postgres: format!(
-                "{}:{}",
-                POSTGRES_IMAGE,
-                dev.postgres_tag
-                    .clone()
-                    .unwrap_or(POSTGRES_IMAGE_TAG.to_string())
-            ),
-            mongo: format!(
-                "{}:{}",
-                MONGO_IMAGE,
-                dev.mongo_tag.clone().unwrap_or(MONGO_IMAGE_TAG.to_string())
-            ),
-        }
-    } else {
-        ServiceImages {
-            app: format!(
-                "{}{}:{}",
-                APP_BASE_IMAGE, default_app_image, default_app_tag
-            ),
-            devtool: format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG),
-            postgres: format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG),
-            mongo: format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG),
-        }
-    };
+    let service_images = get_services_images(dev_conf);
 
     let compose = Compose {
         services: Some(Services(
@@ -343,6 +302,51 @@ fn current_dir_name() -> Option<String> {
     }
 }
 
+pub fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
+    let default_app_image = current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string());
+    let default_app_tag = get_current_branch().unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
+
+    if let Some(dev) = dev_conf {
+        ServiceImages {
+            app: format!(
+                "{}{}:{}",
+                APP_BASE_IMAGE,
+                dev.app_name.clone().unwrap_or(default_app_image),
+                dev.app_tag.clone().unwrap_or(default_app_tag)
+            ),
+            devtool: format!(
+                "{}:{}",
+                DEVTOOL_IMAGE,
+                dev.devtool_tag
+                    .clone()
+                    .unwrap_or(DEVTOOL_DEFAULT_TAG.to_string())
+            ),
+            postgres: format!(
+                "{}:{}",
+                POSTGRES_IMAGE,
+                dev.postgres_tag
+                    .clone()
+                    .unwrap_or(POSTGRES_IMAGE_TAG.to_string())
+            ),
+            mongo: format!(
+                "{}:{}",
+                MONGO_IMAGE,
+                dev.mongo_tag.clone().unwrap_or(MONGO_IMAGE_TAG.to_string())
+            ),
+        }
+    } else {
+        ServiceImages {
+            app: format!(
+                "{}{}:{}",
+                APP_BASE_IMAGE, default_app_image, default_app_tag
+            ),
+            devtool: format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG),
+            postgres: format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG),
+            mongo: format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG),
+        }
+    }
+}
+
 #[derive(clap::ValueEnum, Clone, Debug)]
 pub enum Service {
     App,
@@ -360,11 +364,20 @@ impl Service {
             Service::Mongo => MONGO_SERVICE_NAME,
         }
     }
+
+    pub fn get_image(&self, images: &ServiceImages) -> String {
+        match self {
+            Service::App => images.app.clone(),
+            Service::Devtool => images.devtool.clone(),
+            Service::Postgres => images.postgres.clone(),
+            Service::Mongo => images.mongo.clone(),
+        }
+    }
 }
 
-struct ServiceImages {
-    app: String,
-    devtool: String,
-    postgres: String,
-    mongo: String,
+pub struct ServiceImages {
+    pub app: String,
+    pub devtool: String,
+    pub postgres: String,
+    pub mongo: String,
 }
diff --git a/src/errors.rs b/src/errors.rs
new file mode 100644
index 0000000..34afc44
--- /dev/null
+++ b/src/errors.rs
@@ -0,0 +1,15 @@
+use thiserror::Error;
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error("Could not open file: {0}")]
+    OpenFile(#[from] std::io::Error),
+    #[error("Error while deserializing the JSON document: {0}")]
+    DeserializeJson(#[from] serde_json::Error),
+    #[error("Error while deserializing the YAML document: {0}")]
+    DeserializeYaml(#[from] serde_yaml::Error),
+    #[error("{0}")]
+    Custom(String),
+}
diff --git a/src/main.rs b/src/main.rs
index b5b63a9..2c8b825 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,9 @@ use env_logger;
 
 mod cli;
 mod config;
+mod docker;
 mod docker_compose;
+mod errors;
 mod git;
 
 fn main() {

From da980ce1e166b5449ac3f1a57b99776ef3c9f71b Mon Sep 17 00:00:00 2001
From: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com>
Date: Tue, 3 Jan 2023 11:42:34 +0100
Subject: [PATCH 27/76] feat: MongoDB URL to HOSTNAME (#74)

---
 src/docker_compose.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 34fa01f..7f49e12 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -69,8 +69,8 @@ fn generate_docker_compose_content(
         Some(format!("http://{}:{}", DEVTOOL_SERVICE_NAME, DEVTOOL_PORT)),
     ));
     devtool_env_vec.push((
-        "MONGO_URL".to_string(),
-        Some(format!("mongodb://{}:{}", MONGO_SERVICE_NAME, MONGO_PORT)),
+        "MONGO_HOSTNAME".to_string(),
+        Some(MONGO_SERVICE_NAME.to_string()),
     ));
     let devtool_envs: [(String, Option<String>); 7] = devtool_env_vec.try_into().unwrap();
 

From 548aace1d0dd8e439de1e96dfa87033b74d77bca Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Wed, 4 Jan 2023 09:46:08 +0100
Subject: [PATCH 28/76] docs: Set the lenra_cli the main repo (#119)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 11 +++++++
 .github/ISSUE_TEMPLATE/config.yml     |  2 +-
 README.md                             | 44 +++++++++++++++------------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b2de2f8..a72d9af 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -19,6 +19,17 @@ body:
       value: "A bug happened!"
     validations:
       required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browsers are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome (or chrome-based)
+        - Safari
+        - Microsoft Edge
+        - Other (specify above)
   - type: input
     id: version
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f6ce4ed..5b0669e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,5 +2,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Feature request
-    url: https://github.com/lenra-io/Lenra/discussions/categories/ideas
+    url: https://github.com/orgs/lenra-io/discussions/categories/ideas?discussions_q=category%3AIdeas+is%3Aunlocked
     about: Please send your feature request in the discussion tab !
diff --git a/README.md b/README.md
index 13cb0c2..bbe5a3c 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,40 @@
 <div id="top"></div>
-<!--
-*** Thanks for checking out the Best-README-Template. If you have a suggestion
-*** that would make this better, please fork the repo and create a pull request
-*** or simply open an issue with the tag "enhancement".
-*** Don't forget to give the project a star!
-*** Thanks again! Now go create something AMAZING! :D
--->
-
-
-
-<!-- PROJECT SHIELDS -->
-<!--
-*** I'm using markdown "reference style" links for readability.
-*** Reference links are enclosed in brackets [ ] instead of parentheses ( ).
-*** See the bottom of this document for the declaration of the reference variables
-*** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
-*** https://www.markdownguide.org/basic-syntax/#reference-style-links
--->
+
+<div align="center">
+  <!-- Keep one empty line -->
+
 [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]
 [![Issues][issues-shield]][issues-url]
 [![MIT License][license-shield]][license-url]
+</div>
 
-# Lenra cli
+<!-- PROJECT LOGO -->
+<br />
+<div align="center">
+  <!-- <a href="https://github.com/lenra-io/template-hello-world-node12">
+    <img src="images/logo.png" alt="Logo" width="80" height="80">
+  </a> -->
 
-The Lenra's command line interface.
+<h1 align="center">Lenra CLI</h1>
+
+  <p align="center">
+    The Lenra's command line interface.
+  </p>
+</div>
 
 [Report Bug](https://github.com/lenra-io/lenra_cli/issues)
 ·
 [Request Feature](https://github.com/lenra-io/lenra_cli/issues)
 
+
+## What is Lenra
+
+Lenra is an open source framework to create your app using any language, and deploy it without any Ops scale, built on ethical values.
+
+[Discover our framework](https://www.lenra.io/discover.html)
+
 <!-- GETTING STARTED -->
 ## Getting Started
 

From cd9b6fae4bf5d8d14c3050d744ea9f2d319d054c Mon Sep 17 00:00:00 2001
From: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com>
Date: Wed, 4 Jan 2023 15:32:12 +0100
Subject: [PATCH 29/76] feat: check template command (#58)

Co-authored-by: Thomas DA ROCHA <thomas.darocha@lenra.io>
Co-authored-by: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
---
 .github/dependabot.yml         |  11 +
 .github/workflows/build_ci.yml |  10 +-
 Cargo.lock                     | 615 +++++++++++++++++++++++++--------
 Cargo.toml                     |   7 +-
 README.md                      | 265 +-------------
 docs/build.md                  |  18 +
 docs/check-template.md         |  20 ++
 docs/check.md                  |  25 ++
 docs/dev-continue.md           |  15 +
 docs/dev-expose.md             |  19 +
 docs/dev-reload.md             |  15 +
 docs/dev.md                    |  59 ++++
 docs/init.md                   |  16 +
 docs/logs.md                   |  29 ++
 docs/new.md                    |  25 ++
 docs/start.md                  |  17 +
 docs/stop.md                   |  16 +
 docs/update.md                 |  20 ++
 src/cli/build.rs               |  25 +-
 src/cli/check/mod.rs           | 284 +++++++++++++++
 src/cli/check/template.rs      | 234 +++++++++++++
 src/cli/dev.rs                 |  39 +--
 src/cli/init.rs                |   7 +-
 src/cli/interactive.rs         | 150 +++++---
 src/cli/logs.rs                |  12 +-
 src/cli/mod.rs                 |  20 +-
 src/cli/new.rs                 |  49 +--
 src/cli/start.rs               |  36 +-
 src/cli/stop.rs                |  18 +-
 src/cli/update.rs              |  83 +++--
 src/config.rs                  |  82 +++--
 src/devtool.rs                 |  17 +
 src/docker.rs                  |   8 +-
 src/docker_compose.rs          | 128 +++----
 src/errors.rs                  |  54 ++-
 src/git.rs                     |  24 +-
 src/main.rs                    |   8 +-
 src/matching.rs                | 173 ++++++++++
 38 files changed, 1961 insertions(+), 692 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 docs/build.md
 create mode 100644 docs/check-template.md
 create mode 100644 docs/check.md
 create mode 100644 docs/dev-continue.md
 create mode 100644 docs/dev-expose.md
 create mode 100644 docs/dev-reload.md
 create mode 100644 docs/dev.md
 create mode 100644 docs/init.md
 create mode 100644 docs/logs.md
 create mode 100644 docs/new.md
 create mode 100644 docs/start.md
 create mode 100644 docs/stop.md
 create mode 100644 docs/update.md
 create mode 100644 src/cli/check/mod.rs
 create mode 100644 src/cli/check/template.rs
 create mode 100644 src/devtool.rs
 create mode 100644 src/matching.rs

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..e8d486a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "cargo" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
index b5e6dc7..3bcef51 100644
--- a/.github/workflows/build_ci.yml
+++ b/.github/workflows/build_ci.yml
@@ -113,11 +113,11 @@ jobs:
           arch: x86_64
           runner: windows-2022
           file_extension: '.exe'
-        - target: aarch64-pc-windows-msvc
-          os: windows
-          arch: aarch64
-          runner: windows-2022
-          file_extension: '.exe'
+        # - target: aarch64-pc-windows-msvc
+        #   os: windows
+        #   arch: aarch64
+        #   runner: windows-2022
+        #   file_extension: '.exe'
         - target: x86_64-apple-darwin
           os: macos
           arch: x86_64
diff --git a/Cargo.lock b/Cargo.lock
index ba89d32..2335ed4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,11 +2,17 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
  "memchr",
 ]
@@ -20,13 +26,24 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "async-trait"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
  "winapi",
 ]
@@ -37,6 +54,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -45,15 +68,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bumpalo"
-version = "3.11.0"
+version = "3.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+
+[[package]]
+name = "bytes"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
 [[package]]
 name = "cfg-if"
@@ -63,9 +92,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -76,11 +105,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "chunked_transfer"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a"
+
 [[package]]
 name = "clap"
-version = "3.2.22"
+version = "3.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
 dependencies = [
  "atty",
  "bitflags",
@@ -136,6 +171,17 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "colored"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
+dependencies = [
+ "atty",
+ "lazy_static",
+ "winapi",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.3"
@@ -143,20 +189,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
-name = "ctrlc"
-version = "3.2.3"
+name = "crc32fast"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "nix 0.25.0",
- "winapi",
+ "cfg-if",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.79"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8"
+checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -166,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.79"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d050484b55975889284352b0ffc2ecbda25c0c55978017c132b29ba0818a86"
+checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -181,15 +226,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.79"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78"
+checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.79"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f"
+checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -198,9 +243,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02"
+checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -208,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f"
+checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
 dependencies = [
  "fnv",
  "ident_case",
@@ -222,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
+checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
 dependencies = [
  "darling_core",
  "quote",
@@ -305,25 +350,25 @@ dependencies = [
 
 [[package]]
 name = "docker-compose-types"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00fe22855b33a9b97809f4053f6e7b3bf6281f28fbbf82b9fe302195ab74535"
+checksum = "0900732e214525bab1bfa1ed134f3397938d978c9d09d67387147680fbcb129c"
 dependencies = [
  "derive_builder",
  "indexmap",
  "serde",
- "serde_yaml 0.8.26",
+ "serde_yaml",
 ]
 
 [[package]]
 name = "dofigen"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d305bfc3e9688f7addf7baa68ee6ce333112b88f7817e9f4655b445e5844b2b"
+checksum = "77b39d241f5d272b78696bfc0fa06b94d92fcb0cb8b6cfd316f412fe8dd6cf72"
 dependencies = [
  "serde",
  "serde_json",
- "serde_yaml 0.9.13",
+ "serde_yaml",
  "thiserror",
 ]
 
@@ -335,9 +380,9 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "env_logger"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
 dependencies = [
  "atty",
  "humantime",
@@ -379,26 +424,45 @@ dependencies = [
 
 [[package]]
 name = "fd-lock"
-version = "3.0.6"
+version = "3.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517"
+checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27"
 dependencies = [
  "cfg-if",
  "rustix",
  "windows-sys",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
+]
+
 [[package]]
 name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
  "cfg-if",
  "libc",
@@ -426,6 +490,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -434,9 +507,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.51"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -462,11 +535,21 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "indexmap"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -475,15 +558,19 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "0.7.3"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
 
 [[package]]
 name = "itoa"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "js-sys"
@@ -504,9 +591,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 name = "lenra_cli"
 version = "0.0.0"
 dependencies = [
+ "async-trait",
  "chrono",
  "clap",
- "ctrlc",
+ "colored",
  "dirs",
  "docker-compose-types",
  "dofigen",
@@ -518,36 +606,42 @@ dependencies = [
  "rustyline",
  "serde",
  "serde_json",
- "serde_yaml 0.9.13",
+ "serde_yaml",
  "thiserror",
+ "tokio",
+ "ureq",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.134"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
  "cc",
 ]
 
 [[package]]
-name = "linked-hash-map"
-version = "0.5.6"
+name = "linux-raw-sys"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.0.46"
+name = "lock_api"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
 
 [[package]]
 name = "log"
@@ -565,32 +659,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
-name = "nibble_vec"
-version = "0.1.0"
+name = "miniz_oxide"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
 dependencies = [
- "smallvec",
+ "adler",
 ]
 
 [[package]]
-name = "nix"
-version = "0.24.2"
+name = "mio"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
- "bitflags",
- "cfg-if",
  "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
+]
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
 ]
 
 [[package]]
 name = "nix"
-version = "0.25.0"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "autocfg",
  "bitflags",
  "cfg-if",
  "libc",
@@ -616,10 +719,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "once_cell"
+name = "num_cpus"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "open"
@@ -633,9 +746,32 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.3.0"
+version = "6.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
 
 [[package]]
 name = "pathdiff"
@@ -643,6 +779,18 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -669,18 +817,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.46"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -717,9 +865,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -728,15 +876,30 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
 
 [[package]]
 name = "rustix"
-version = "0.35.11"
+version = "0.36.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef"
+checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
 dependencies = [
  "bitflags",
  "errno",
@@ -746,6 +909,18 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+dependencies = [
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
 [[package]]
 name = "rustyline"
 version = "10.0.0"
@@ -760,7 +935,7 @@ dependencies = [
  "libc",
  "log",
  "memchr",
- "nix 0.24.2",
+ "nix",
  "radix_trie",
  "scopeguard",
  "unicode-segmentation",
@@ -771,9 +946,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "scopeguard"
@@ -783,24 +958,34 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+
+[[package]]
+name = "sct"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.145"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.145"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -809,9 +994,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.85"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa",
  "ryu",
@@ -820,27 +1005,24 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.26"
+version = "0.9.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+checksum = "92b5b431e8907b50339b51223b97d102db8d987ced36f6e4d03621db9316c834"
 dependencies = [
  "indexmap",
+ "itoa",
  "ryu",
  "serde",
- "yaml-rust",
+ "unsafe-libyaml",
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.9.13"
+name = "signal-hook-registry"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
+ "libc",
 ]
 
 [[package]]
@@ -849,6 +1031,22 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
+[[package]]
+name = "socket2"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "str-buf"
 version = "1.0.6"
@@ -863,9 +1061,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.101"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -883,24 +1081,24 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -909,20 +1107,81 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
 dependencies = [
  "libc",
  "wasi 0.10.0+wasi-snapshot-preview1",
  "winapi",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "tokio"
+version = "1.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "num_cpus",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+
 [[package]]
 name = "unicode-ident"
-version = "1.0.4"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
 
 [[package]]
 name = "unicode-segmentation"
@@ -938,9 +1197,45 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.4"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "ureq"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"
+checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
+dependencies = [
+ "base64",
+ "chunked_transfer",
+ "flate2",
+ "log",
+ "once_cell",
+ "rustls",
+ "serde",
+ "serde_json",
+ "url",
+ "webpki",
+ "webpki-roots",
+]
+
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
 
 [[package]]
 name = "utf8parse"
@@ -1020,6 +1315,35 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
+[[package]]
+name = "web-sys"
+version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1053,52 +1377,57 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
-name = "yaml-rust"
-version = "0.4.5"
+name = "windows_x86_64_msvc"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
diff --git a/Cargo.toml b/Cargo.toml
index e0b208a..ce758d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,11 +28,14 @@ log = "0.4.17"
 env_logger = "0.9.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
-dofigen = "1"
+dofigen = "1.2.0"
 docker-compose-types = "0.2.2"
 open = "1"
-ctrlc = "3.2.3"
 rustyline = "10.0.0"
 dirs = "4.0.0"
 chrono = "0.4.22"
 thiserror = "1.0.37"
+colored = "2.0.0"
+ureq = { version = "2.5.0", features = ["json"] }
+tokio = { version = "1.23.0", features = ["full"] }
+async-trait = "0.1.60"
diff --git a/README.md b/README.md
index bbe5a3c..d06eb38 100644
--- a/README.md
+++ b/README.md
@@ -91,6 +91,7 @@ OPTIONS:
 
 SUBCOMMANDS:
     build     Build your app in release mode
+    check     Checks the running app
     dev       Start the app in an interactive mode
     help      Print this message or the help of the given subcommand(s)
     init      Generates dockerfile and docker compose file with the init command
@@ -101,254 +102,26 @@ SUBCOMMANDS:
     update    Update the tools Docker images
 ```
 
-### Subcommands
-
-This tools contains many subcommands to help you doing what you need.
-
-- [new](#new): creates a new Lenra app project
-- [build](#build): builds the Lenra app of the current directory
-- [start](#start): starts your app previously built with the build command
-- [logs](#logs): displays output from the containers
-- [stop](#stop): stops your app previously started with the start command
-- [dev](#dev): starts your app in dev mode
-- [init](#init): generates Docker and Docker Compose files
-- [update](#update): updates the tools Docker images
-
-#### new
-
-This subcommand creates a new Lenra app project from a given template and in a given directory.
-The target directory must not exist.
-
-```bash
-$ lenra new --help
-lenra-new 
-Create a new Lenra app project
-
-USAGE:
-    lenra new <TEMPLATE> <PATH>
-
-ARGS:
-    <TEMPLATE>    The project template from which your project will be created. For example,
-                  defining `rust` or `template-rust` will use the next one:
-                  https://github.com/lenra-io/template-rust You can find all our templates at
-                  this url:
-                  https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
-                  You also can set the template project full url to use custom ones
-    <PATH>        The project path
-
-OPTIONS:
-    -h, --help    Print help information
-```
-
-#### build
-
-This subcommand builds the Lenra app of the current directory.
-The app configuration are defined by a [configuration file](#configuration-file).
-
-```bash
-$ lenra build --help
-lenra-build 
-Build your app in release mode
-
-USAGE:
-    lenra build [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-        --expose             Exposes all services ports
-    -h, --help               Print help information
-```
-
-#### start
-
-This subcommand starts the Lenra app of the current directory previously built.
-
-```bash
-$ lenra start --help
-lenra-start 
-Start your app previously built with the build command
-
-USAGE:
-    lenra start [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-        --expose             Exposes all services ports
-    -h, --help               Print help information
-```
-
-#### logs
-
-This subcommand displays output from the containers.
-
-```bash
-$ lenra logs --help
-lenra-logs 
-View output from the containers
-
-USAGE:
-    lenra logs [OPTIONS] [SERVICES]...
-
-ARGS:
-    <SERVICES>...    The logged service list [default: app] [possible values: app, devtool,
-                     postgres]
-
-OPTIONS:
-    -f, --follow           Follow log output
-    -h, --help             Print help information
-        --no-color         Produce monochrome output
-        --no-log-prefix    Don't print prefix in logs
-        --since <SINCE>    Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g.
-                           42m for 42 minutes)
-    -t, --timestamps       Show timestamps
-        --tail <TAIL>      Number of lines to show from the end of the logs for each container
-                           [default: all]
-        --until <UNTIL>    Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative
-                           (e.g. 42m for 42 minutes)
-```
-
-#### stop
-
-This subcommand stops the Lenra app of the current directory and removes the Docker Compose elements.
-
-```bash
-$ lenra stop --help
-lenra-stop 
-Stop your app previously started with the start command
-
-USAGE:
-    lenra stop [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-    -h, --help               Print help information
-```
-
-#### dev
-
-This subcommand starts the Lenra app of the current directory in dev mode.
-
-```bash
-$ lenra dev --help
-lenra-dev 
-Start the app in an interactive mode
-
-USAGE:
-    lenra dev [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-        --expose             Exposes all services ports
-    -h, --help               Print help information
-```
-
-#### init
-
-This subcommand generates Docker and Docker Compose files.
-
-```bash
-$ lenra init --help
-lenra-init 
-Generates dockerfile and docker compose file with the init command
-
-USAGE:
-    lenra init [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-    -h, --help               Print help information
-```
-
-#### update
-
-This subcommand updates the tools Docker images.
-
-```bash
-$ lenra update --help
-lenra-update 
-Update the tools Docker images
-
-USAGE:
-    lenra update [OPTIONS] [SERVICES]...
-
-ARGS:
-    <SERVICES>...    The service list to pull [default: devtool postgres mongo] [possible
-                     values: app, devtool, postgres, mongo]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-    -h, --help               Print help information
-```
-
-## dev interactive commands
-
-When using the [dev](#dev) sub-command, the CLI enters an interactive mode.
-The interactive mode builds and starts the app and then displays its logs.
-
-When the CLI receive a `Ctrl + C` signal in dev mode, it displays an interactive command prompt.
-Here is the `help` interactive command result:
-
-```bash
-[lenra]$ help
-lenra_cli 
-The Lenra interactive command line interface
-
-USAGE:
-    lenra <SUBCOMMAND>
-
-OPTIONS:
-    -h, --help    Print help information
-
-SUBCOMMANDS:
-    continue    Continue the previous logs command since the last displayed logs
-    help        Print this message or the help of the given subcommand(s)
-    logs        View output from the containers
-    reload      Reload the by rebuilding and restarting it
-    stop        Stop your app previously started with the start command
-```
-
-### Subcommands
-
-This tools contains many subcommands to help you do what you need.
-
-- [continue](#continue): continues the previous logs command since the last displayed logs
-- [logs](#logs): displays output from the containers
-- [reload](#reload): reloads the app by rebuilding and restarting it
-- [stop](#stop): stops your app previously started with the start command
-
-#### continue
-
-This subcommand continues the previous logs command since the last displayed logs.
-
-```bash
-[lenra]$ continue --help
-lenra-continue 
-Continue the previous logs command since the last displayed logs
-
-USAGE:
-    lenra continue
-
-OPTIONS:
-    -h, --help    Print help information
-```
+<p align="right">(<a href="#top">back to top</a>)</p>
 
-#### reload
+## Subcommands
 
-This subcommand reloads the app by rebuilding and restarting it.
+This tool contains many subcommands to help you doing what you need.
 
-```bash
-[lenra]$ reload --help
-lenra-reload 
-Reload the app by rebuilding and restarting it
+- [new](docs/new.md): creates a new Lenra app project
+- [dev](docs/dev.md): starts your app in dev mode
+- [update](docs/update.md): updates the tools Docker images
+- [build](docs/build.md): builds the Lenra app of the current directory
+- [start](docs/start.md): starts your app previously built with the build command
+- [logs](docs/logs.md): displays output from the containers
+- [stop](docs/stop.md): stops your app previously started with the start command
+- [check](docs/check.md): checks the running app
+- [init](docs/init.md): generates Docker and Docker Compose files
 
-USAGE:
-    lenra reload
 
-OPTIONS:
-    -h, --help    Print help information
-```
+<p align="right">(<a href="#top">back to top</a>)</p>
 
-### Configuration file
+## Configuration file
 
 The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
 
@@ -360,7 +133,7 @@ generator:
   dofigen: dofigen.yml
 ```
 
-#### Configuration
+### Configuration
 
 The configuration is the main element of the file:
 
@@ -369,20 +142,20 @@ The configuration is the main element of the file:
 | `componentsApi`  | String           | The components API version    |
 | `generator`      | [Generator](#generator)  The generator configuration |
 
-#### Generator
+### Generator
 
 The generator define your application is built. There are many configurators:
 
 - [Dofigen](#dofigen)
 - [Docker](#docker)
 
-##### Dofigen
+#### Dofigen
 
 The Dofigen generator use a [Dofigen](https://github.com/lenra-io/dofigen) configuration to generate the Docker image.
 
 The Dofigen configuration can be the path to a Dofigen file or it content directly.
 
-##### Docker
+#### Docker
 
 The Docker generator use a Dockerfile to generate the Docker image.
 
diff --git a/docs/build.md b/docs/build.md
new file mode 100644
index 0000000..27bb7e4
--- /dev/null
+++ b/docs/build.md
@@ -0,0 +1,18 @@
+# build
+
+This subcommand builds the Lenra app of the current directory.
+The app configuration is defined by a [configuration file](#configuration-file).
+
+```bash
+$ lenra build --help
+lenra-build 
+Build your app in release mode
+
+USAGE:
+    lenra build [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+```
diff --git a/docs/check-template.md b/docs/check-template.md
new file mode 100644
index 0000000..aeb4fc2
--- /dev/null
+++ b/docs/check-template.md
@@ -0,0 +1,20 @@
+# check template
+
+This subcommands checks the running app as a Lenra template app.
+
+```bash
+$ lenra check template --help
+lenra-check-template 
+Checks the current project as a template
+
+USAGE:
+    lenra check template [OPTIONS] [RULES]...
+
+ARGS:
+    <RULES>...    The rules
+
+OPTIONS:
+    -h, --help               Print help information
+        --ignore <IGNORE>    A list of rules to ignore
+        --strict             The strict mode also fails with warning rules
+```
\ No newline at end of file
diff --git a/docs/check.md b/docs/check.md
new file mode 100644
index 0000000..47f427e
--- /dev/null
+++ b/docs/check.md
@@ -0,0 +1,25 @@
+# check
+
+This subcommands check the running app.
+
+```bash
+$ lenra check --help
+lenra-check 
+Checks the running app
+
+USAGE:
+    lenra check <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    help        Print this message or the help of the given subcommand(s)
+    template    Checks the current project as a template
+```
+
+## Subcommands
+
+This tool contains many subcommands to help you doing what you need.
+
+- [template](docs/check-template.md): checks the current project as a template
\ No newline at end of file
diff --git a/docs/dev-continue.md b/docs/dev-continue.md
new file mode 100644
index 0000000..7aef651
--- /dev/null
+++ b/docs/dev-continue.md
@@ -0,0 +1,15 @@
+# continue
+
+This subcommand continues the previous logs command since the last displayed logs.
+
+```bash
+[lenra]$ continue --help
+lenra-continue 
+Continue the previous logs command since the last displayed logs
+
+USAGE:
+    lenra continue
+
+OPTIONS:
+    -h, --help    Print help information
+```
diff --git a/docs/dev-expose.md b/docs/dev-expose.md
new file mode 100644
index 0000000..86a8f96
--- /dev/null
+++ b/docs/dev-expose.md
@@ -0,0 +1,19 @@
+# expose
+
+This subcommand exposes the containers ports.
+
+```bash
+[lenra]$ expose --help
+lenra-expose 
+Exposes the app ports
+
+USAGE:
+    lenra expose [SERVICES]...
+
+ARGS:
+    <SERVICES>...    The service list to expose [default: app postgres mongo] [possible values:
+                     app, devtool, postgres, mongo]
+
+OPTIONS:
+    -h, --help    Print help information
+```
diff --git a/docs/dev-reload.md b/docs/dev-reload.md
new file mode 100644
index 0000000..675926d
--- /dev/null
+++ b/docs/dev-reload.md
@@ -0,0 +1,15 @@
+# reload
+
+This subcommand reloads the app by rebuilding and restarting it.
+
+```bash
+[lenra]$ reload --help
+lenra-reload 
+Reload the app by rebuilding and restarting it
+
+USAGE:
+    lenra reload
+
+OPTIONS:
+    -h, --help    Print help information
+```
diff --git a/docs/dev.md b/docs/dev.md
new file mode 100644
index 0000000..599176b
--- /dev/null
+++ b/docs/dev.md
@@ -0,0 +1,59 @@
+# dev
+
+This subcommand starts the Lenra app of the current directory in dev mode.
+
+The dev mode builds and starts the app and then displays its logs.
+
+```bash
+$ lenra dev --help
+lenra-dev 
+Start the app in an interactive mode
+
+USAGE:
+    lenra dev [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+```
+
+When the CLI receive a `Ctrl + C` signal while displaying logs in dev mode, it displays an [interactive command prompt](#interactive-commands).
+
+## Interactive commands
+
+Here is the `help` interactive command result:
+
+```bash
+[lenra]$ help
+lenra_cli 
+The Lenra interactive command line interface
+
+USAGE:
+    lenra <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    check       Checks the running app
+    continue    Continue the previous logs command since the last displayed logs
+    exit        stop alias. Stop your app previously started with the start command
+    expose      Exposes the app ports
+    help        Print this message or the help of the given subcommand(s)
+    logs        View output from the containers
+    reload      Reload the app by rebuilding and restarting it
+    stop        Stop your app previously started with the start command
+```
+
+### Subcommands
+
+This tools contains many subcommands to help you do what you need.
+
+- [continue](docs/dev-continue.md): continues the previous logs command since the last displayed logs
+- [reload](docs/dev-reload.md): reloads the app by rebuilding and restarting it
+- [stop](docs/stop.md): stops your app previously started with the start command
+- [exit](docs/stop.md): `stop` alias
+- [expose](docs/dev-expose.md): exposes the app ports
+- [logs](docs/logs.md): displays output from the containers
+- [check](docs/check.md): checks the running app
diff --git a/docs/init.md b/docs/init.md
new file mode 100644
index 0000000..cce408e
--- /dev/null
+++ b/docs/init.md
@@ -0,0 +1,16 @@
+# init
+
+This subcommand generates Docker and Docker Compose files.
+
+```bash
+$ lenra init --help
+lenra-init 
+Generates dockerfile and docker compose file with the init command
+
+USAGE:
+    lenra init [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
diff --git a/docs/logs.md b/docs/logs.md
new file mode 100644
index 0000000..7c2a5ae
--- /dev/null
+++ b/docs/logs.md
@@ -0,0 +1,29 @@
+# logs
+
+This subcommand displays output from the containers.
+
+```bash
+$ lenra logs --help
+lenra-logs 
+View output from the containers
+
+USAGE:
+    lenra logs [OPTIONS] [SERVICES]...
+
+ARGS:
+    <SERVICES>...    The logged service list [default: app] [possible values: app, devtool,
+                     postgres]
+
+OPTIONS:
+    -f, --follow           Follow log output
+    -h, --help             Print help information
+        --no-color         Produce monochrome output
+        --no-log-prefix    Don't print prefix in logs
+        --since <SINCE>    Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g.
+                           42m for 42 minutes)
+    -t, --timestamps       Show timestamps
+        --tail <TAIL>      Number of lines to show from the end of the logs for each container
+                           [default: all]
+        --until <UNTIL>    Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative
+                           (e.g. 42m for 42 minutes)
+```
diff --git a/docs/new.md b/docs/new.md
new file mode 100644
index 0000000..f27dcce
--- /dev/null
+++ b/docs/new.md
@@ -0,0 +1,25 @@
+# new
+
+This subcommand creates a new Lenra app project from a given template and in a given directory.
+The target directory must not exist.
+
+```bash
+$ lenra new --help
+lenra-new 
+Create a new Lenra app project
+
+USAGE:
+    lenra new <TEMPLATE> <PATH>
+
+ARGS:
+    <TEMPLATE>    The project template from which your project will be created. For example,
+                  defining `rust` or `template-rust` will use the next one:
+                  https://github.com/lenra-io/template-rust You can find all our templates at
+                  this url:
+                  https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
+                  You also can set the template project full url to use custom ones
+    <PATH>        The project path
+
+OPTIONS:
+    -h, --help    Print help information
+```
diff --git a/docs/start.md b/docs/start.md
new file mode 100644
index 0000000..6c887b4
--- /dev/null
+++ b/docs/start.md
@@ -0,0 +1,17 @@
+# start
+
+This subcommand starts the Lenra app of the current directory previously built.
+
+```bash
+$ lenra start --help
+lenra-start 
+Start your app previously built with the build command
+
+USAGE:
+    lenra start [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+```
diff --git a/docs/stop.md b/docs/stop.md
new file mode 100644
index 0000000..2988baf
--- /dev/null
+++ b/docs/stop.md
@@ -0,0 +1,16 @@
+# stop
+
+This subcommand stops the Lenra app of the current directory and removes the Docker Compose elements.
+
+```bash
+$ lenra stop --help
+lenra-stop 
+Stop your app previously started with the start command
+
+USAGE:
+    lenra stop [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
diff --git a/docs/update.md b/docs/update.md
new file mode 100644
index 0000000..1801b3c
--- /dev/null
+++ b/docs/update.md
@@ -0,0 +1,20 @@
+# update
+
+This subcommand updates the tools Docker images.
+
+```bash
+$ lenra update --help
+lenra-update 
+Update the tools Docker images
+
+USAGE:
+    lenra update [OPTIONS] [SERVICES]...
+
+ARGS:
+    <SERVICES>...    The service list to pull [default: devtool postgres mongo] [possible
+                     values: app, devtool, postgres, mongo]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+    -h, --help               Print help information
+```
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 03dd95c..927ffae 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -1,10 +1,12 @@
+use async_trait::async_trait;
 use log;
 
 use clap;
 
 use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
-use crate::docker_compose::compose_build;
+use crate::docker_compose::{compose_build, Service};
+use crate::errors::Result;
 
 #[derive(clap::Args, Default)]
 pub struct Build {
@@ -12,30 +14,33 @@ pub struct Build {
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 
-    /// Exposes all services ports.
-    #[clap(long, action)]
-    pub expose: bool,
+    /// Exposes services ports.
+    #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
+    pub expose: Vec<Service>,
 }
 
 impl Build {
     /// Builds a Dockerfile. If None, get's it at the default path: ./.lenra/Dockerfile
-    fn build_docker_compose(&self) {
+    async fn build_docker_compose(&self) -> Result<()> {
         log::info!("Build the Docker image");
 
-        compose_build();
+        compose_build().await?;
 
         log::info!("Image built");
+        Ok(())
     }
 }
 
+#[async_trait]
 impl CliCommand for Build {
-    fn run(&self) {
-        let conf = load_config_file(&self.config).unwrap();
+    async fn run(&self) -> Result<()> {
+        let conf = load_config_file(&self.config)?;
         // TODO: check the components API version
 
-        conf.generate_files(self.expose);
+        conf.generate_files(self.expose.clone()).await?;
 
         // self.build_docker_image(conf);
-        self.build_docker_compose();
+        self.build_docker_compose().await?;
+        Ok(())
     }
 }
diff --git a/src/cli/check/mod.rs b/src/cli/check/mod.rs
new file mode 100644
index 0000000..6101b09
--- /dev/null
+++ b/src/cli/check/mod.rs
@@ -0,0 +1,284 @@
+use std::fmt::Debug;
+
+use async_trait::async_trait;
+use clap::{Args, Subcommand};
+use colored::{Color, ColoredString, Colorize};
+use log::{debug, info};
+use serde_json::Value;
+
+use crate::{
+    errors::{Error, Result},
+    matching::{Matching, MatchingErrorType},
+};
+
+use self::template::TemplateChecker;
+
+use super::CliCommand;
+
+mod template;
+
+pub const RULE_SEPARATOR: &str = ":";
+pub const VIEW: &str = "view";
+
+#[derive(Args, Clone, Debug)]
+pub struct Check {
+    #[clap(subcommand)]
+    command: CheckCommandType,
+}
+
+/// The check subcommands
+#[derive(Subcommand, Clone, Debug)]
+pub enum CheckCommandType {
+    // /// Checks the current project as an app
+    // App(CheckParameters),
+    /// Checks the current project as a template
+    Template(CheckParameters),
+}
+
+#[async_trait]
+impl CliCommand for Check {
+    async fn run(&self) -> Result<()> {
+        match self.command.clone() {
+            CheckCommandType::Template(params) => {
+                let template_checker = TemplateChecker;
+                template_checker.check(params)
+            }
+        }
+    }
+}
+
+#[derive(Args, Default, Clone, Debug)]
+pub struct CheckParameters {
+    /// The strict mode also fails with warning rules.
+    #[clap(long, action)]
+    pub strict: bool,
+
+    /// A list of rules to ignore
+    #[clap(long)]
+    pub ignore: Option<Vec<String>>,
+
+    /// The rules
+    #[clap()]
+    pub rules: Vec<String>,
+}
+
+pub trait AppChecker: Debug {
+    fn check_list(&self) -> Vec<ValueChecker>;
+
+    fn check(&self, params: CheckParameters) -> Result<()> {
+        info!("Check with {:?}", self);
+        // TODO: start app
+
+        let check_list = self.check_list();
+
+        debug!("Check list: {:?}", check_list);
+
+        let mut fail: bool = false;
+        check_list
+            .iter()
+            .filter(|checker| params.rules.is_empty() || params.rules.contains(&checker.name))
+            .for_each(|checker| {
+                let errors = checker.check(params.ignore.clone().unwrap_or(vec![]));
+                let name = checker.name.clone();
+                let mut messages: Vec<ColoredString> = vec![];
+
+                let mut levels: Vec<CheckerLevel> = errors
+                    .iter()
+                    .map(|error| {
+                        let lvl = match error.level {
+                            RuleErrorLevel::Warning => CheckerLevel::Warning,
+                            RuleErrorLevel::Error => CheckerLevel::Error,
+                        };
+                        messages.push(
+                            format!("    {}\n        {}", error.rule, error.message)
+                                .color(lvl.color()),
+                        );
+                        lvl
+                    })
+                    .collect();
+                levels.sort();
+                levels.reverse();
+
+                let level: &CheckerLevel = levels.get(0).unwrap_or(&CheckerLevel::Ok);
+                println!(
+                    "{}",
+                    format!("{:20}: {:?}", name, level).color(level.color())
+                );
+                messages.iter().for_each(|msg| println!("{}", msg));
+                if level == &CheckerLevel::Error
+                    || (level == &CheckerLevel::Warning && params.strict)
+                {
+                    fail = true;
+                }
+            });
+        if fail {
+            return Err(Error::Check);
+        }
+        Ok(())
+    }
+}
+
+fn ignore_rule(parts: Vec<String>, ignores: Vec<String>) -> bool {
+    let mut prefix = String::new();
+    for part in parts {
+        prefix.push_str(part.as_str());
+        if ignores.contains(&prefix) {
+            return true;
+        }
+        prefix.push_str(RULE_SEPARATOR);
+        if ignores.contains(&format!("{}*", prefix)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub enum CheckerLevel {
+    Ok,
+    Warning,
+    Error,
+}
+
+impl CheckerLevel {
+    fn color(&self) -> Color {
+        match self {
+            CheckerLevel::Ok => Color::Green,
+            CheckerLevel::Warning => Color::Yellow,
+            CheckerLevel::Error => Color::Red,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ValueChecker {
+    name: String,
+    expected: Value,
+    loader: fn() -> Result<Value>,
+}
+
+impl ValueChecker {
+    pub fn rules(&self) -> Vec<Rule<Value>> {
+        vec![Rule {
+            name: "match".into(),
+            description: "Checks that the data matches the expected one".into(),
+            examples: vec![],
+            check: |value, expected| {
+                value
+                    .check_match(&expected)
+                    .iter()
+                    .map(|err| match err.error_type.clone() {
+                        MatchingErrorType::NotSameType { actual, expected } => RuleError {
+                            rule: format!("{}{}{}", "sameType", RULE_SEPARATOR, err.path),
+                            message: format!(
+                                "Not matching type for {}: got {} but expected {}",
+                                err.path,
+                                actual.type_name(),
+                                expected.type_name()
+                            ),
+                            level: RuleErrorLevel::Error,
+                        },
+                        MatchingErrorType::NotSameValue { actual, expected } => RuleError {
+                            rule: format!("{}{}{}", "sameValue", RULE_SEPARATOR, err.path),
+                            message: format!(
+                                "Not matching value for {}: got {:?} but expected {:?}",
+                                err.path, actual, expected
+                            ),
+                            level: RuleErrorLevel::Error,
+                        },
+                        MatchingErrorType::AdditionalProperty => RuleError {
+                            rule: format!("{}{}{}", "additionalProperty", RULE_SEPARATOR, err.path),
+                            message: format!("Additional property {}", err.path),
+                            level: RuleErrorLevel::Warning,
+                        },
+                        MatchingErrorType::MissingProperty => RuleError {
+                            rule: format!("{}{}{}", "missingProperty", RULE_SEPARATOR, err.path),
+                            message: format!("Missing property {}", err.path),
+                            level: RuleErrorLevel::Error,
+                        },
+                    })
+                    .collect()
+            },
+        }]
+    }
+
+    pub fn check(&self, ignores: Vec<String>) -> Vec<RuleError> {
+        if ignore_rule(vec![self.name.clone()], ignores.clone()) {
+            info!("Checker '{}' ignored", self.name);
+            return vec![];
+        }
+        let res = (self.loader)();
+        match res {
+            Ok(value) => self
+                .rules()
+                .iter()
+                .flat_map(|rule| {
+                    if ignore_rule(vec![self.name.clone(), rule.name.clone()], ignores.clone()) {
+                        info!("Rule '{}' ignored for checker '{}'", rule.name, self.name);
+                        return vec![];
+                    }
+
+                    debug!("Check {}{}{}", self.name, RULE_SEPARATOR, rule.name);
+                    rule.check(value.clone(), self.expected.clone())
+                        .iter()
+                        .map(|error| RuleError {
+                            rule: format!("{}{}{}", self.name, RULE_SEPARATOR, error.rule),
+                            message: error.message.clone(),
+                            level: error.level.clone(),
+                        })
+                        .filter(|error| {
+                            !ignore_rule(
+                                error
+                                    .rule
+                                    .split(RULE_SEPARATOR)
+                                    .map(|str| str.into())
+                                    .collect(),
+                                ignores.clone(),
+                            )
+                        })
+                        .collect()
+                })
+                .collect(),
+            Err(err) => vec![RuleError {
+                rule: format!("{}{}{}", self.name, RULE_SEPARATOR, "unexpectedError"),
+                message: format!("Error loading {} checker data: {:?}", self.name, err),
+                level: RuleErrorLevel::Error,
+            }],
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct RuleError {
+    rule: String,
+    message: String,
+    level: RuleErrorLevel,
+}
+
+#[derive(Debug, Clone)]
+pub enum RuleErrorLevel {
+    Warning,
+    Error,
+}
+
+#[derive(Debug, Clone)]
+pub struct Rule<T> {
+    pub name: String,
+    pub description: String,
+    pub examples: Vec<String>,
+    pub check: fn(T, T) -> Vec<RuleError>,
+}
+
+impl<T> Rule<T> {
+    fn check(&self, param: T, expected: T) -> Vec<RuleError> {
+        (self.check)(param, expected)
+    }
+}
+
+pub fn call_app(request: Value) -> Result<Value> {
+    ureq::post("http://localhost:8080")
+        .send_json(request)
+        .map_err(Error::from)?
+        .into_json()
+        .map_err(Error::from)
+}
diff --git a/src/cli/check/template.rs b/src/cli/check/template.rs
new file mode 100644
index 0000000..91409c2
--- /dev/null
+++ b/src/cli/check/template.rs
@@ -0,0 +1,234 @@
+pub use clap::Args;
+
+use serde_json::json;
+
+use crate::errors::Error;
+
+use super::{call_app, AppChecker, ValueChecker, RULE_SEPARATOR, VIEW};
+
+#[derive(Debug)]
+pub struct TemplateChecker;
+
+impl AppChecker for TemplateChecker {
+    fn check_list(&self) -> Vec<ValueChecker> {
+        vec![
+            ValueChecker {
+                name: "manifest".into(),
+                loader: || call_app(json!({})).map_err(Error::from),
+                expected: json!({
+                    "manifest": {
+                        "rootView": "main"
+                    }
+                }),
+            },
+            ValueChecker {
+                name: format!("{}{}{}", VIEW, RULE_SEPARATOR, "main"),
+                loader: || {
+                    call_app(json!({
+                        "view": "main"
+                    }))
+                    .map_err(Error::from)
+                },
+                expected: json!({
+                  "type": "flex",
+                  "direction": "vertical",
+                  "scroll": true,
+                  "spacing": 4,
+                  "crossAxisAlignment": "center",
+                  "children": [
+                    {
+                      "type": "view",
+                      "name": "menu",
+                    },
+                    {
+                      "type": "view",
+                      "name": "home"
+                    }
+                  ]
+                }),
+            },
+            ValueChecker {
+                name: format!("{}{}{}", VIEW, RULE_SEPARATOR, "menu"),
+                loader: || {
+                    call_app(json!({
+                        "view": "menu"
+                    }))
+                    .map_err(Error::from)
+                },
+                expected: json!({
+                    "type": "container",
+                    "decoration": {
+                        "color": 0xFFFFFFFFu32,
+                        "boxShadow": {
+                            "blurRadius": 8,
+                            "color": 0x1A000000,
+                            "offset": {
+                                "dx": 0,
+                                "dy": 1
+                            }
+                        },
+                    },
+                    "padding": {
+                        "top": 16,
+                        "bottom": 16,
+                        "left": 32,
+                        "right": 32,
+                    },
+                    "child": {
+                        "type": "flex",
+                        "fillParent": true,
+                        "mainAxisAlignment": "spaceBetween",
+                        "crossAxisAlignment": "center",
+                        "padding": { "right": 32 },
+                        "children": [
+                            {
+                              "type": "container",
+                              "constraints": {
+                                "minWidth": 32,
+                                "minHeight": 32,
+                                "maxWidth": 32,
+                                "maxHeight": 32,
+                              },
+                              "child": {
+                                "type": "image",
+                                "src": "logo.png"
+                              },
+                            },
+                            {
+                              "type": "flexible",
+                              "child": {
+                                "type": "container",
+                                "child": {
+                                  "type": "text",
+                                  "value": "Hello World",
+                                  "textAlign": "center",
+                                  "style": {
+                                    "fontWeight": "bold",
+                                    "fontSize": 24,
+                                  },
+                                }
+                              }
+                            }
+                        ]
+                    },
+                }),
+            },
+            ValueChecker {
+                name: format!("{}{}{}", VIEW, RULE_SEPARATOR, "home"),
+                loader: || {
+                    call_app(json!({
+                        "view": "home"
+                    }))
+                    .map_err(Error::from)
+                },
+                expected: json!({
+                  "type": "flex",
+                  "direction": "vertical",
+                  "spacing": 16,
+                  "mainAxisAlignment": "spaceEvenly",
+                  "crossAxisAlignment": "center",
+                  "children": [
+                    {
+                      "type": "view",
+                      "name": "counter",
+                      "coll": "counter",
+                      "query": {
+                        "user": "@me"
+                      },
+                      "props": { "text": "My personnal counter" }
+                    },
+                    {
+                      "type": "view",
+                      "name": "counter",
+                      "coll": "counter",
+                      "query": {
+                        "user": "global"
+                      },
+                      "props": { "text": "The common counter" }
+                    }
+                  ]
+                }),
+            },
+            ValueChecker {
+                name: format!("{}{}{}", VIEW, RULE_SEPARATOR, "counter"),
+                loader: || {
+                    call_app(json!({
+                        "view": "counter",
+                        "data": [{
+                          "_id": "ObjectId(my_counter_id)",
+                          "count": 2,
+                          "user": "my_user_id",
+                        }],
+                        "props": { "text": "My counter text" }
+                    }))
+                    .map_err(Error::from)
+                },
+                expected: json!({
+                  "type": "flex",
+                  "spacing": 16,
+                  "mainAxisAlignment": "spaceEvenly",
+                  "crossAxisAlignment": "center",
+                  "children": [
+                    {
+                      "type": "text",
+                      "value": "My counter text: 2",
+                    },
+                    {
+                      "type": "button",
+                      "text": "+",
+                      "onPressed": {
+                          "action": "increment",
+                          "props": {
+                              "id": "ObjectId(my_counter_id)"
+                          }
+                      }
+                    }
+                  ]
+                }),
+            },
+        ]
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::TemplateChecker;
+    use crate::cli::check::AppChecker;
+
+    #[test]
+    fn check_list_size() {
+        let template_checker = TemplateChecker;
+        let check_list = template_checker.check_list();
+        assert_eq!(
+            check_list.len(),
+            5,
+            "The template checklist size is not correct"
+        );
+    }
+
+    #[test]
+    fn check_unique_names() {
+        let template_checker = TemplateChecker;
+        let check_list = template_checker.check_list();
+        let mut checker_names: Vec<String> = vec![];
+        check_list.iter().for_each(|checker| {
+            assert!(
+                !checker_names.contains(&checker.name),
+                "There is at least two checkers with the same name: {}",
+                checker.name
+            );
+            checker_names.push(checker.name.clone());
+            let mut rule_names: Vec<String> = vec![];
+
+            checker.rules().iter().for_each(|rule| {
+                assert!(
+                    !rule_names.contains(&rule.name),
+                    "There is at least two rules with the same name in the '{}' checker: {}",
+                    checker.name,
+                    rule.name
+                );
+                rule_names.push(rule.name.clone());
+            });
+        });
+    }
+}
diff --git a/src/cli/dev.rs b/src/cli/dev.rs
index bdae905..f744099 100644
--- a/src/cli/dev.rs
+++ b/src/cli/dev.rs
@@ -1,5 +1,5 @@
+use async_trait::async_trait;
 pub use clap::Args;
-use log::debug;
 
 use crate::cli::build::Build;
 use crate::cli::interactive::{run_interactive_command, InteractiveContext};
@@ -7,6 +7,8 @@ use crate::cli::start::Start;
 use crate::cli::stop::Stop;
 use crate::cli::CliCommand;
 use crate::config::DEFAULT_CONFIG_FILE;
+use crate::docker_compose::Service;
+use crate::errors::Result;
 
 #[derive(Args)]
 pub struct Dev {
@@ -14,48 +16,43 @@ pub struct Dev {
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 
-    /// Exposes all services ports.
-    #[clap(long, action)]
-    pub expose: bool,
+    /// Exposes services ports.
+    #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
+    pub expose: Vec<Service>,
 }
 
+#[async_trait]
 impl CliCommand for Dev {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         log::info!("Run dev mode");
 
         let build = Build {
             config: self.config.clone(),
-            expose: self.expose,
+            expose: self.expose.clone(),
             ..Default::default()
         };
         log::debug!("Run build");
-        build.run();
+        build.run().await?;
 
         let start = Start {
             config: self.config.clone(),
-            expose: self.expose,
+            expose: self.expose.clone(),
             ..Default::default()
         };
         log::debug!("Run start");
-        start.run();
+        start.run().await?;
 
-        ctrlc::set_handler(move || {
-            debug!("Stop asked");
-        })
-        .expect("Error setting Ctrl-C handler");
-
-        let res = run_interactive_command(&InteractiveContext {
+        run_interactive_command(&InteractiveContext {
             config: self.config.clone(),
-            expose: self.expose,
-        });
-        if let Err(error) = res {
-            println!("An error occured: {}", error.to_string());
-        }
+            expose: self.expose.clone(),
+        })
+        .await?;
 
         let stop = Stop;
         log::debug!("Run stop");
-        stop.run();
+        stop.run().await?;
 
         log::debug!("End of dev mode");
+        Ok(())
     }
 }
diff --git a/src/cli/init.rs b/src/cli/init.rs
index d8b5d86..44a3b2b 100644
--- a/src/cli/init.rs
+++ b/src/cli/init.rs
@@ -1,7 +1,9 @@
+use async_trait::async_trait;
 use clap;
 
 use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
+use crate::errors::Result;
 
 #[derive(clap::Args)]
 pub struct Init {
@@ -10,10 +12,11 @@ pub struct Init {
     pub config: std::path::PathBuf,
 }
 
+#[async_trait]
 impl CliCommand for Init {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         let conf = load_config_file(&self.config).unwrap();
         // TODO: check the components API version
-        conf.generate_docker_files();
+        conf.generate_docker_files()
     }
 }
diff --git a/src/cli/interactive.rs b/src/cli/interactive.rs
index e866603..1a7ed2d 100644
--- a/src/cli/interactive.rs
+++ b/src/cli/interactive.rs
@@ -6,20 +6,28 @@ use clap::{CommandFactory, FromArgMatches};
 use dirs::config_dir;
 use log::{debug, warn};
 use rustyline::{error::ReadlineError, Editor};
+use tokio::select;
 
 use crate::{
-    cli::{build::Build, start::Start},
-    docker_compose::Service,
+    config::load_config_file,
+    devtool::stop_app_env,
+    docker_compose::{compose_build, compose_up, Service},
+    errors::{Error, Result},
 };
 
-use super::{logs::Logs, CliCommand};
+use super::{check::Check, logs::Logs, CliCommand};
 
 const LENRA_COMMAND: &str = "lenra";
 const READLINE_PROMPT: &str = "[lenra]$ ";
 
-pub fn run_interactive_command(context: &InteractiveContext) -> Result<(), ReadlineError> {
+pub async fn run_interactive_command(initial_context: &InteractiveContext) -> Result<()> {
+    // ctrlc::set_handler(move || {
+    //     debug!("Stop asked");
+    // })
+    // .expect("Error setting Ctrl-C handler");
+
     let history_path = config_dir()
-        .expect("Can't get the user config directory")
+        .ok_or(Error::Custom("Can't get the user config directory".into()))?
         .join("lenra")
         .join("dev.history");
     let mut rl = Editor::<()>::new()?;
@@ -34,33 +42,51 @@ pub fn run_interactive_command(context: &InteractiveContext) -> Result<(), Readl
         follow: true,
         ..Default::default()
     };
-    let mut last_logs = run_logs(&previous_log, None);
+    let mut last_logs = run_logs(&previous_log, None).await?;
+    let mut context = initial_context.clone();
 
     loop {
         let readline = rl.readline(READLINE_PROMPT);
         match readline {
             Ok(line) => {
+                if line.trim().is_empty() {
+                    continue;
+                }
+
                 rl.add_history_entry(line.as_str());
-                let result = parse_command_line(line);
 
-                match result {
+                let command = parse_command_line(line.clone()).map_err(Error::from);
+                match command {
                     Ok(interactive) => {
-                        let logs_since = match interactive.command {
-                            InteractiveCommand::Continue => Some(last_logs),
+                        debug!("Run command {:#?}", interactive.command);
+                        match interactive.command {
+                            InteractiveCommand::Continue => {
+                                last_logs = run_logs(&previous_log, Some(last_logs)).await?;
+                            }
                             InteractiveCommand::Logs(logs) => {
                                 previous_log = logs.clone();
-                                None
+                                last_logs = run_logs(&previous_log, None).await?;
                             }
-                            InteractiveCommand::Stop => break,
+                            InteractiveCommand::Stop | InteractiveCommand::Exit => break,
                             cmd => {
-                                cmd.run(context);
-                                Some(last_logs)
+                                let ctx = context.clone();
+                                match cmd.run(&ctx).await {
+                                    Ok(ctx_opt) => {
+                                        if let Some(ctx) = ctx_opt {
+                                            context = ctx.clone();
+                                        }
+                                    }
+                                    Err(error) => eprintln!("{}", error),
+                                }
                             }
-                        };
-                        last_logs = run_logs(&previous_log, logs_since);
+                        }
+                    }
+                    Err(Error::ParseCommand(clap_error)) => {
+                        clap_error.print().ok();
                     }
-                    Err(e) => {
-                        e.print().expect("Could not print error");
+                    Err(err) => {
+                        debug!("Parse command error: {}", err);
+                        warn!("not a valid command {}", line);
                     }
                 }
             }
@@ -80,10 +106,10 @@ pub fn run_interactive_command(context: &InteractiveContext) -> Result<(), Readl
     }
     debug!("Save history to {:?}", history_path);
     fs::create_dir_all(history_path.parent().unwrap())?;
-    rl.save_history(&history_path)
+    rl.save_history(&history_path).map_err(Error::from)
 }
 
-fn run_logs(logs: &Logs, last_end: Option<DateTime<Utc>>) -> DateTime<Utc> {
+async fn run_logs(logs: &Logs, last_end: Option<DateTime<Utc>>) -> Result<DateTime<Utc>> {
     let mut clone = logs.clone();
     if let Some(last_logs) = last_end {
         // Only displays new logs
@@ -91,8 +117,11 @@ fn run_logs(logs: &Logs, last_end: Option<DateTime<Utc>>) -> DateTime<Utc> {
         // Follows the logs
         clone.follow = true;
     }
-    clone.run();
-    Utc::now()
+    select! {
+        res = clone.run() => {res?}
+        _ = tokio::signal::ctrl_c() => {}
+    }
+    Ok(Utc::now())
 }
 
 fn parse_command_line(line: String) -> Result<Interactive, clap::Error> {
@@ -105,6 +134,8 @@ fn parse_command_line(line: String) -> Result<Interactive, clap::Error> {
             args.rotate_right(1);
         }
     }
+    debug!("Try to parse interactive command: {:?}", args);
+
     let command = <Interactive as CommandFactory>::command();
     let mut matches = command
         .clone()
@@ -118,16 +149,17 @@ fn format_error(err: clap::Error) -> clap::Error {
     err.format(&mut command)
 }
 
+#[derive(Clone, Debug)]
 pub struct InteractiveContext {
     /// The app configuration file.
     pub config: std::path::PathBuf,
 
     /// Exposes all services ports.
-    pub expose: bool,
+    pub expose: Vec<Service>,
 }
 
 /// The Lenra interactive command line interface
-#[derive(Parser)]
+#[derive(Parser, Debug)]
 #[clap(rename_all = "kebab-case")]
 pub struct Interactive {
     #[clap(subcommand)]
@@ -135,7 +167,7 @@ pub struct Interactive {
 }
 
 /// The interactive commands
-#[derive(Subcommand, Clone)]
+#[derive(Subcommand, Clone, Debug)]
 pub enum InteractiveCommand {
     /// Continue the previous logs command since the last displayed logs
     Continue,
@@ -145,31 +177,63 @@ pub enum InteractiveCommand {
     Reload,
     /// Stop your app previously started with the start command
     Stop,
+    /// stop alias. Stop your app previously started with the start command
+    Exit,
+    /// Checks the running app
+    Check(Check),
+    /// Exposes the app ports
+    Expose(Expose),
+}
+
+#[derive(Args, Clone, Debug)]
+pub struct Expose {
+    /// The service list to expose
+    #[clap(value_enum, default_values = &["app", "postgres", "mongo"])]
+    pub services: Vec<Service>,
 }
 
 impl InteractiveCommand {
-    fn run(&self, context: &InteractiveContext) {
+    async fn run(&self, context: &InteractiveContext) -> Result<Option<InteractiveContext>> {
+        let conf = load_config_file(&context.config).unwrap();
         match self {
             InteractiveCommand::Continue => warn!("The continue command should not be run"),
-            InteractiveCommand::Logs(_logs) => println!("logs is not implemented yet"),
-            InteractiveCommand::Stop => warn!("The stop command should not be run"),
+            InteractiveCommand::Logs(_logs) => warn!("The logs command should not be run"),
+            InteractiveCommand::Stop | InteractiveCommand::Exit => {
+                warn!("The stop command should not be run")
+            }
             InteractiveCommand::Reload => {
-                let build = Build {
-                    config: context.config.clone(),
-                    expose: context.expose,
-                    ..Default::default()
-                };
-                log::debug!("Run build");
-                build.run();
-
-                let start = Start {
-                    config: context.config.clone(),
-                    expose: context.expose,
-                    ..Default::default()
-                };
-                log::debug!("Run start");
-                start.run();
+                log::debug!("Generates files");
+                conf.generate_files(context.expose.clone()).await?;
+
+                log::debug!("Docker compose build");
+                compose_build().await?;
+
+                log::debug!("Starts the containers");
+                compose_up().await?;
+
+                log::debug!("Stop the devtool app env to reset cache");
+                let result = stop_app_env().await;
+                if let Err(error) = result {
+                    log::info!("{:?}", error);
+                }
+            }
+            InteractiveCommand::Check(check) => {
+                if context.expose.contains(&Service::App) {
+                    check.run().await?
+                } else {
+                    println!("The check commands can't run if the ports are not exposed. Run the expose command first");
+                }
+            }
+            InteractiveCommand::Expose(expose) => {
+                conf.generate_files(expose.services.clone()).await?;
+
+                compose_up().await?;
+
+                let mut ctx = context.clone();
+                ctx.expose = expose.services.clone();
+                return Ok(Some(ctx));
             }
         };
+        Ok(None)
     }
 }
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index 1af7866..bd4aab4 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -1,12 +1,14 @@
 use std::process::Stdio;
 
+use async_trait::async_trait;
 pub use clap::Args;
 use log::warn;
 
 use crate::cli::CliCommand;
 use crate::docker_compose::{create_compose_command, Service};
+use crate::errors::Result;
 
-#[derive(Args, Default, Clone)]
+#[derive(Args, Default, Clone, Debug)]
 pub struct Logs {
     /// Follow log output
     #[clap(short, long, action)]
@@ -41,8 +43,9 @@ pub struct Logs {
     pub services: Vec<Service>,
 }
 
+#[async_trait]
 impl CliCommand for Logs {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         log::info!("Show logs");
 
         let mut command = create_compose_command();
@@ -77,9 +80,7 @@ impl CliCommand for Logs {
         });
 
         log::debug!("cmd: {:?}", command);
-        let output = command
-            .output()
-            .expect("Failed to logs the docker-compose app");
+        let output = command.spawn()?.wait_with_output().await?;
 
         if !output.status.success() {
             warn!(
@@ -88,5 +89,6 @@ impl CliCommand for Logs {
                 String::from_utf8(output.stderr).unwrap()
             )
         }
+        Ok(())
     }
 }
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index f1daa97..6dbbcfd 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,11 +1,15 @@
+use async_trait::async_trait;
 pub use clap::{Args, Parser, Subcommand};
 
+use crate::errors::Result;
+
 use self::{
-    build::Build, dev::Dev, init::Init, logs::Logs, new::New, start::Start, stop::Stop,
-    update::Update,
+    build::Build, check::Check, dev::Dev, init::Init, logs::Logs, new::New, start::Start,
+    stop::Stop, update::Update,
 };
 
 mod build;
+mod check;
 mod dev;
 mod init;
 mod interactive;
@@ -23,8 +27,9 @@ pub struct Cli {
     pub command: Command,
 }
 
+#[async_trait]
 pub trait CliCommand {
-    fn run(&self);
+    async fn run(&self) -> Result<()>;
 }
 
 /// The subcommands
@@ -46,10 +51,13 @@ pub enum Command {
     Init(Init),
     /// Update the tools Docker images
     Update(Update),
+    /// Checks the running app
+    Check(Check),
 }
 
+#[async_trait]
 impl CliCommand for Command {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         match self {
             Command::New(new) => new.run(),
             Command::Build(build) => build.run(),
@@ -59,6 +67,8 @@ impl CliCommand for Command {
             Command::Dev(dev) => dev.run(),
             Command::Init(init) => init.run(),
             Command::Update(update) => update.run(),
-        };
+            Command::Check(check) => check.run(),
+        }
+        .await
     }
 }
diff --git a/src/cli/new.rs b/src/cli/new.rs
index 3a7aacc..f2296b5 100644
--- a/src/cli/new.rs
+++ b/src/cli/new.rs
@@ -2,14 +2,16 @@
 //!
 //! The new subcommand creates a new Lenra app project from a given template and into a given path
 
+use async_trait::async_trait;
 pub use clap::Args;
 use lazy_static::lazy_static;
 use log;
 use regex::Regex;
 use std::fs;
-use std::process::Command;
+use tokio::process::Command;
 
 use crate::cli::CliCommand;
+use crate::errors::{Error, Result};
 
 #[derive(Args)]
 pub struct New {
@@ -29,10 +31,14 @@ lazy_static! {
         Regex::new(r"^(template-)?([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
 }
 
+#[async_trait]
 impl CliCommand for New {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         if self.path.exists() {
-            panic!("The path '{}' already exists", self.path.display())
+            return Err(Error::Custom(format!(
+                "The path '{}' already exists",
+                self.path.display()
+            )));
         }
 
         let template = if TEMPLATE_SHORT_REGEX.is_match(self.template.as_str()) {
@@ -49,25 +55,17 @@ impl CliCommand for New {
             template,
             self.path.display()
         );
-        match Command::new("git")
+        Command::new("git")
             .arg("clone")
             .arg("--single-branch")
             .arg("--depth")
             .arg("1")
             .arg(template)
             .arg(self.path.as_os_str())
-            .spawn()
-        {
-            Ok(child) => {
-                child
-                    .wait_with_output()
-                    .expect("Failed to clone the template");
-            }
-            Err(e) => match e.kind() {
-                std::io::ErrorKind::NotFound => panic!("`git` was not found!"),
-                _ => panic!("Some unkown error occurred"),
-            },
-        }
+            .spawn()?
+            .wait_with_output()
+            .await
+            .map_err(Error::from)?;
 
         log::debug!("remove git directory");
         fs::remove_dir_all(self.path.join(".git")).unwrap();
@@ -76,20 +74,27 @@ impl CliCommand for New {
         Command::new("git")
             .current_dir(self.path.as_os_str())
             .arg("init")
-            .output()
-            .expect("Failed initiating git project");
+            .spawn()?
+            .wait_with_output()
+            .await
+            .map_err(Error::from)?;
         Command::new("git")
             .current_dir(self.path.as_os_str())
             .arg("add")
             .arg(".")
-            .output()
-            .expect("Failed during git add");
+            .spawn()?
+            .wait_with_output()
+            .await
+            .map_err(Error::from)?;
         Command::new("git")
             .current_dir(self.path.as_os_str())
             .arg("commit")
             .arg("-m")
             .arg("Init project")
-            .output()
-            .expect("Failed during git add");
+            .spawn()?
+            .wait_with_output()
+            .await
+            .map_err(Error::from)?;
+        Ok(())
     }
 }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index 517269e..fa4b486 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -1,12 +1,13 @@
 use std::path::PathBuf;
 
+use async_trait::async_trait;
 pub use clap::Args;
 
 use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
-use crate::docker_compose::{
-    self, compose_up, execute_compose_service_command, DEVTOOL_SERVICE_NAME,
-};
+use crate::devtool::stop_app_env;
+use crate::docker_compose::{self, compose_up, Service};
+use crate::errors::Result;
 
 #[derive(Args, Default)]
 pub struct Start {
@@ -14,41 +15,36 @@ pub struct Start {
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 
-    /// Exposes all services ports.
-    #[clap(long, action)]
-    pub expose: bool,
+    /// Exposes services ports.
+    #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
+    pub expose: Vec<Service>,
 }
 
+#[async_trait]
 impl CliCommand for Start {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         log::info!("Starting the app");
-        let conf = load_config_file(&self.config).unwrap();
+        let conf = load_config_file(&self.config)?;
 
         let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
         if !dockercompose_path.exists() {
             // TODO: check the components API version
 
-            conf.generate_files(self.expose);
+            conf.generate_files(self.expose.clone()).await?;
         }
 
         // Start the containers
-        compose_up();
+        compose_up().await?;
         // Stop the devtool app env to reset cache
-        let result = execute_compose_service_command(
-            DEVTOOL_SERVICE_NAME,
-            &[
-                "bin/dev_tools",
-                "rpc",
-                "ApplicationRunner.Environment.DynamicSupervisor.stop_env(1)",
-            ],
-        );
+        let result = stop_app_env().await;
         if let Err(error) = result {
-            log::info!("{}", error);
+            log::info!("{:?}", error);
         }
         // Open the app
         println!(
-            "Application available at http://localhost:{}",
+            "\nApplication available at http://localhost:{}\n",
             docker_compose::DEVTOOL_PORT
         );
+        Ok(())
     }
 }
diff --git a/src/cli/stop.rs b/src/cli/stop.rs
index 4e6b066..75ed5fb 100644
--- a/src/cli/stop.rs
+++ b/src/cli/stop.rs
@@ -1,15 +1,19 @@
 use std::process::Stdio;
 
+use async_trait::async_trait;
 pub use clap::Args;
+use log::warn;
 
 use crate::cli::CliCommand;
 use crate::docker_compose::create_compose_command;
+use crate::errors::{CommandError, Error, Result};
 
 #[derive(Args, Clone)]
 pub struct Stop;
 
+#[async_trait]
 impl CliCommand for Stop {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         log::info!("Stoping the app");
 
         let mut command = create_compose_command();
@@ -21,15 +25,11 @@ impl CliCommand for Stop {
             .stderr(Stdio::inherit());
 
         log::debug!("cmd: {:?}", command);
-        let output = command
-            .output()
-            .expect("Failed to stop the docker-compose app");
+        let output = command.spawn()?.wait_with_output().await?;
         if !output.status.success() {
-            panic!(
-                "An error occured while stoping the docker-compose app:\n{}\n{}",
-                String::from_utf8(output.stdout).unwrap(),
-                String::from_utf8(output.stderr).unwrap()
-            )
+            warn!("An error occured while stoping the docker-compose app");
+            return Err(Error::Command(CommandError { command, output }));
         }
+        Ok(())
     }
 }
diff --git a/src/cli/update.rs b/src/cli/update.rs
index f6db6f6..be6dba4 100644
--- a/src/cli/update.rs
+++ b/src/cli/update.rs
@@ -1,11 +1,13 @@
-use std::process::Stdio;
-
+use async_trait::async_trait;
 pub use clap::Args;
+use log::{info, warn};
+use tokio::task::JoinSet;
 
 use crate::cli::CliCommand;
 use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
 use crate::docker;
-use crate::docker_compose::{get_services_images, Service};
+use crate::docker_compose::{get_services_images, Service, ServiceImages};
+use crate::errors::{CommandError, Error, Result};
 
 #[derive(Args, Clone)]
 pub struct Update {
@@ -18,8 +20,9 @@ pub struct Update {
     pub services: Vec<Service>,
 }
 
+#[async_trait]
 impl CliCommand for Update {
-    fn run(&self) {
+    async fn run(&self) -> Result<()> {
         log::info!("Updating Docker images");
 
         let conf = load_config_file(&self.config).ok();
@@ -28,28 +31,54 @@ impl CliCommand for Update {
         } else {
             &None
         };
-        let images = get_services_images(dev_conf);
-
-        let processes = self.services.iter().map(|service| {
-            docker::pull(service.get_image(&images))
-                .stdout(Stdio::inherit())
-                .stderr(Stdio::inherit())
-                .spawn()
-        });
-
-        processes.for_each(|p| {
-            let output = p
-                .expect("Failed to update the Docker image")
-                .wait_with_output()
-                .expect("Failed to get command output");
-
-            if !output.status.success() {
-                panic!(
-                    "An error occured while updating Docker image:\n{}\n{}",
-                    String::from_utf8(output.stdout).unwrap(),
-                    String::from_utf8(output.stderr).unwrap()
-                )
-            }
-        });
+        let images = get_services_images(dev_conf).await;
+
+        // Pull images in parallele
+        let mut processes = JoinSet::new();
+
+        self.services
+            .iter()
+            .filter(|&service| match service {
+                Service::App => false,
+                _ => true,
+            })
+            .for_each(|service| {
+                let imgs = images.clone();
+                let serv = service.clone();
+                processes.spawn(async move { pull_service_image(&imgs, &serv).await });
+            });
+
+        // Wait for all the pull end
+        while let Some(res) = processes.join_next().await {
+            res?;
+        }
+
+        Ok(())
+    }
+}
+
+async fn pull_service_image(images: &ServiceImages, service: &Service) {
+    let image = images.get(service);
+    info!("Start pulling {}", image);
+    let mut command = docker::pull(image.clone());
+
+    let spawn_res = command.spawn().map_err(Error::from);
+    if let Err(err) = &spawn_res {
+        warn!("{}", err)
+    }
+    let res = spawn_res
+        .unwrap()
+        .wait_with_output()
+        .await
+        .map_err(Error::from);
+    if let Err(err) = &res {
+        warn!("{}", err)
+    }
+
+    let output = res.unwrap();
+    if !output.status.success() {
+        warn!("{}", CommandError { command, output });
+    } else {
+        info!("Image pulled {}", image);
     }
 }
diff --git a/src/config.rs b/src/config.rs
index c8da5a6..6ed902f 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 
 use crate::{
-    docker_compose::generate_docker_compose,
+    docker_compose::{generate_docker_compose, Service},
     errors::{Error, Result},
 };
 
@@ -20,17 +20,14 @@ pub const DOCKERCOMPOSE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "docke
 
 pub const OF_WATCHDOG_BUILDER: &str = "of-watchdog";
 pub const OF_WATCHDOG_IMAGE: &str = "ghcr.io/openfaas/of-watchdog";
-pub const OF_WATCHDOG_VERSION: &str = "0.9.6";
+pub const OF_WATCHDOG_VERSION: &str = "0.9.10";
 
 pub fn load_config_file(path: &std::path::PathBuf) -> Result<Application> {
-    let file = fs::File::open(path).map_err(|err| Error::OpenFile(err))?;
+    let file = fs::File::open(path).map_err(|err| Error::OpenFile(err, path.clone()))?;
     match path.extension() {
         Some(os_str) => match os_str.to_str() {
-            Some("yml" | "yaml") => {
-                Ok(serde_yaml::from_reader(file).map_err(|err| Error::DeserializeYaml(err))?)
-            }
-            Some("json") => {
-                Ok(serde_json::from_reader(file).map_err(|err| Error::DeserializeJson(err))?)
+            Some("yml" | "yaml" | "json") => {
+                Ok(serde_yaml::from_reader(file).map_err(Error::from)?)
             }
             Some(ext) => Err(Error::Custom(format!(
                 "Not managed config file extension {}",
@@ -106,36 +103,37 @@ pub struct Dockerfile {
 
 impl Application {
     /// Generates all the files needed to build and run the application
-    pub fn generate_files(&self, expose: bool) {
-        self.generate_docker_files();
-        self.generate_docker_compose_file(expose);
+    pub async fn generate_files(&self, exposed_services: Vec<Service>) -> Result<()> {
+        self.generate_docker_files()?;
+        self.generate_docker_compose_file(exposed_services).await?;
+        Ok(())
     }
 
-    pub fn generate_docker_files(&self) {
+    pub fn generate_docker_files(&self) -> Result<()> {
         log::info!("Docker files generation");
         // create the `.lenra` cache directory
         fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
 
         match &self.generator {
             Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen.clone()),
-            Generator::DofigenFile(dofigen_file) => self.build_dofigen(
-                from_file_path(&dofigen_file.dofigen).expect("Failed loading the Dofigen file"),
-            ),
-            Generator::DofigenError { dofigen: _ } => {
-                panic!("Your Dofigen configuration is not correct")
+            Generator::DofigenFile(dofigen_file) => {
+                self.build_dofigen(from_file_path(&dofigen_file.dofigen).map_err(Error::from)?)
             }
-            Generator::Dockerfile(_dockerfile) => (),
+            Generator::DofigenError { dofigen: _ } => Err(Error::Custom(
+                "Your Dofigen configuration is not correct".into(),
+            )),
+            Generator::Dockerfile(_dockerfile) => Ok(()),
             Generator::Docker(docker) => {
-                self.save_docker_content(docker.docker.clone(), docker.ignore.clone());
+                self.save_docker_content(docker.docker.clone(), docker.ignore.clone())
             }
-            Generator::Unknow => panic!("Not managed generator"),
+            Generator::Unknow => Err(Error::Custom("Not managed generator".into())),
         }
     }
 
-    pub fn generate_docker_compose_file(&self, expose: bool) {
+    pub async fn generate_docker_compose_file(&self, exposed_services: Vec<Service>) -> Result<()> {
         log::info!("Docker Compose file generation");
         // create the `.lenra` cache directory
-        fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
+        fs::create_dir_all(LENRA_CACHE_DIRECTORY).map_err(Error::from)?;
 
         let dockerfile: PathBuf = if let Generator::Dockerfile(file_conf) = &self.generator {
             file_conf.docker.clone()
@@ -143,22 +141,25 @@ impl Application {
             DOCKERFILE_DEFAULT_PATH.iter().collect()
         };
 
-        generate_docker_compose(dockerfile, &self.dev, expose);
+        generate_docker_compose(dockerfile, &self.dev, exposed_services)
+            .await
+            .map_err(Error::from)?;
+        Ok(())
     }
 
     /// Builds a Docker image from a Dofigen structure
-    fn build_dofigen(&self, image: Image) {
+    fn build_dofigen(&self, image: Image) -> Result<()> {
         // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
-        let of_overlay = self.dofigen_of_overlay(image);
+        let of_overlay = self.dofigen_of_overlay(image)?;
 
         // generate the Dockerfile and .dockerignore files with Dofigen
         let dockerfile = generate_dockerfile(&of_overlay);
         let dockerignore = generate_dockerignore(&of_overlay);
-        self.save_docker_content(dockerfile, Some(dockerignore));
+        self.save_docker_content(dockerfile, Some(dockerignore))
     }
 
     /// Add an overlay to the given Dofigen structure to manage OpenFaaS
-    fn dofigen_of_overlay(&self, image: Image) -> Image {
+    fn dofigen_of_overlay(&self, image: Image) -> Result<Image> {
         log::info!("Adding OpenFaaS overlay to the Dofigen descriptor");
         let mut builders = if let Some(vec) = image.builders {
             vec
@@ -196,12 +197,16 @@ impl Application {
                     format!("http://127.0.0.1:{}", ports[0]),
                 );
             } else if ports.len() > 1 {
-                panic!("More than one port has been defined in the Dofigen descriptor");
+                return Err(Error::Custom(
+                    "More than one port has been defined in the Dofigen descriptor".into(),
+                ));
             }
         };
 
         if image.entrypoint.is_some() {
-            panic!("The Dofigen descriptor can't have entrypoint defined. Use cmd instead");
+            return Err(Error::Custom(
+                "The Dofigen descriptor can't have entrypoint defined. Use cmd instead".into(),
+            ));
         }
 
         envs.insert("exec_timeout".to_string(), "0".to_string());
@@ -209,10 +214,12 @@ impl Application {
         if let Some(cmd) = image.cmd {
             envs.insert("fprocess".to_string(), cmd.join(" "));
         } else {
-            panic!("The Dofigen cmd property is not defined");
+            return Err(Error::Custom(
+                "The Dofigen cmd property is not defined".into(),
+            ));
         }
 
-        Image {
+        Ok(Image {
             image: image.image,
             builders: Some(builders),
             artifacts: Some(artifacts),
@@ -228,7 +235,7 @@ impl Application {
             caches: image.caches,
             healthcheck: image.healthcheck,
             ignores: image.ignores,
-        }
+        })
     }
 
     /// Saves the Dockerfile and dockerignore (if present) files from their contents
@@ -236,14 +243,15 @@ impl Application {
         &self,
         dockerfile_content: String,
         dockerignore_content: Option<String>,
-    ) {
+    ) -> Result<()> {
         let dockerfile_path: PathBuf = DOCKERFILE_DEFAULT_PATH.iter().collect();
         let dockerignore_path: PathBuf = DOCKERIGNORE_DEFAULT_PATH.iter().collect();
 
-        fs::write(dockerfile_path, dockerfile_content).expect("Unable to write the Dockerfile");
+        fs::write(dockerfile_path, dockerfile_content)?;
         if let Some(content) = dockerignore_content {
-            fs::write(dockerignore_path, content).expect("Unable to write the .dockerignore file");
+            fs::write(dockerignore_path, content)?;
         }
+        Ok(())
     }
 }
 
@@ -295,7 +303,7 @@ mod dofigen_of_overlay_tests {
             ..Default::default()
         };
 
-        assert_eq!(config.dofigen_of_overlay(image), overlayed_image);
+        assert_eq!(config.dofigen_of_overlay(image).unwrap(), overlayed_image);
     }
 
     #[test]
@@ -312,6 +320,6 @@ mod dofigen_of_overlay_tests {
             }),
             ..Default::default()
         };
-        config.dofigen_of_overlay(image);
+        config.dofigen_of_overlay(image).unwrap();
     }
 }
diff --git a/src/devtool.rs b/src/devtool.rs
new file mode 100644
index 0000000..9792209
--- /dev/null
+++ b/src/devtool.rs
@@ -0,0 +1,17 @@
+use crate::{
+    docker_compose::{execute_compose_service_command, DEVTOOL_SERVICE_NAME},
+    errors::Result,
+};
+
+pub async fn stop_app_env() -> Result<()> {
+    execute_compose_service_command(
+        DEVTOOL_SERVICE_NAME,
+        &[
+            "bin/dev_tools",
+            "rpc",
+            "ApplicationRunner.Environment.DynamicSupervisor.stop_env(1)",
+        ],
+    )
+    .await?;
+    Ok(())
+}
diff --git a/src/docker.rs b/src/docker.rs
index f89e874..0aeb8fd 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -1,9 +1,7 @@
-use std::process;
-
-pub fn pull(image: String) -> process::Command {
-    let mut cmd = process::Command::new("docker");
+use tokio::process::Command;
 
+pub fn pull(image: String) -> Command {
+    let mut cmd = Command::new("docker");
     cmd.arg("pull").arg(image);
-
     cmd
 }
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 7f49e12..e40c7a2 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -1,18 +1,16 @@
-use std::{
-    convert::TryInto,
-    env, fs,
-    path::PathBuf,
-    process::{self, Output, Stdio},
-};
-
 use docker_compose_types::{
     AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions,
     Environment, Healthcheck, HealthcheckTest, Services,
 };
 use log::warn;
+use std::process::Stdio;
+use std::{convert::TryInto, env, fs, path::PathBuf};
+use tokio::process;
 
+use crate::errors::Error;
 use crate::{
     config::{Dev, DOCKERCOMPOSE_DEFAULT_PATH},
+    errors::{CommandError, Result},
     git::get_current_branch,
 };
 
@@ -35,17 +33,23 @@ pub const MONGO_PORT: u16 = 27017;
 pub const POSTGRES_PORT: u16 = 5432;
 
 /// Generates the docker-compose.yml file
-pub fn generate_docker_compose(dockerfile: PathBuf, dev_conf: &Option<Dev>, expose: bool) {
-    let compose_content = generate_docker_compose_content(dockerfile, dev_conf, expose);
+pub async fn generate_docker_compose(
+    dockerfile: PathBuf,
+    dev_conf: &Option<Dev>,
+    exposed_services: Vec<Service>,
+) -> Result<()> {
+    let compose_content =
+        generate_docker_compose_content(dockerfile, dev_conf, exposed_services).await?;
     let compose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
-    fs::write(compose_path, compose_content).expect("Unable to write the docker-compose file");
+    fs::write(compose_path, compose_content).map_err(Error::from)?;
+    Ok(())
 }
 
-fn generate_docker_compose_content(
+async fn generate_docker_compose_content(
     dockerfile: PathBuf,
     dev_conf: &Option<Dev>,
-    expose: bool,
-) -> String {
+    exposed_services: Vec<Service>,
+) -> Result<String> {
     let mut devtool_env_vec: Vec<(String, Option<String>)> = vec![
         ("POSTGRES_USER".to_string(), Some("postgres".to_string())),
         (
@@ -88,7 +92,7 @@ fn generate_docker_compose_content(
         ),
     ];
 
-    let service_images = get_services_images(dev_conf);
+    let service_images = get_services_images(dev_conf).await;
 
     let compose = Compose {
         services: Some(Services(
@@ -97,7 +101,7 @@ fn generate_docker_compose_content(
                     APP_SERVICE_NAME.into(),
                     Some(docker_compose_types::Service {
                         image: Some(service_images.app),
-                        ports: if expose { Some(vec![format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT)])} else {None},
+                        ports: if exposed_services.contains(&Service::App) { Some(vec![format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT)])} else {None},
                         build_: Some(BuildStep::Advanced(AdvancedBuildStep {
                             context: "..".into(),
                             dockerfile: Some(dockerfile.to_str().unwrap().into()),
@@ -149,7 +153,7 @@ fn generate_docker_compose_content(
                     Some(
                         docker_compose_types::Service {
                             image: Some(service_images.postgres),
-                            ports: if expose {Some(vec![format!("{}:{}", POSTGRES_PORT, POSTGRES_PORT)])} else {None},
+                            ports: if exposed_services.contains(&Service::Postgres) {Some(vec![format!("{}:{}", POSTGRES_PORT, POSTGRES_PORT)])} else {None},
                             environment: Some(Environment::KvPair(postgres_envs.into())),
                             healthcheck: Some(Healthcheck {
                                 test: Some(HealthcheckTest::Multiple(vec![
@@ -172,7 +176,7 @@ fn generate_docker_compose_content(
                     MONGO_SERVICE_NAME.into(),
                     Some( docker_compose_types::Service {
                             image: Some(service_images.mongo),
-                            ports: if expose {Some(vec![format!("{}:{}", MONGO_PORT, MONGO_PORT)])} else {None},
+                            ports: if exposed_services.contains(&Service::Mongo) {Some(vec![format!("{}:{}", MONGO_PORT, MONGO_PORT)])} else {None},
                             environment: Some(Environment::KvPair(mongo_envs.into())),
                             healthcheck: Some(Healthcheck {
                                 test: Some(HealthcheckTest::Single(r#"test $$(echo "rs.initiate($$CONFIG).ok || rs.status().ok" | mongo --quiet) -eq 1"#.to_string())),
@@ -192,7 +196,7 @@ fn generate_docker_compose_content(
         )),
         ..Default::default()
     };
-    serde_yaml::to_string(&compose).expect("Error generating the docker-compose file content")
+    serde_yaml::to_string(&compose).map_err(Error::from)
 }
 
 pub fn create_compose_command() -> process::Command {
@@ -204,7 +208,7 @@ pub fn create_compose_command() -> process::Command {
     cmd
 }
 
-pub fn compose_up() {
+pub async fn compose_up() -> Result<()> {
     let mut command = create_compose_command();
 
     command
@@ -215,20 +219,18 @@ pub fn compose_up() {
         .stderr(Stdio::inherit());
 
     log::debug!("cmd: {:?}", command);
-    let output = command
-        .output()
-        .expect("Failed to start the docker-compose app");
+    let output = command.spawn()?.wait_with_output().await?;
 
     if !output.status.success() {
         warn!(
-            "An error occured while running the docker-compose app:\n{}\n{}",
-            String::from_utf8(output.stdout).unwrap(),
-            String::from_utf8(output.stderr).unwrap()
+            "An error occured while running the docker-compose app:\n{}",
+            CommandError { command, output }
         )
     }
+    Ok(())
 }
 
-pub fn compose_build() {
+pub async fn compose_build() -> Result<()> {
     let mut command = create_compose_command();
     command.arg("build");
 
@@ -239,20 +241,18 @@ pub fn compose_build() {
     command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
 
     log::debug!("Build: {:?}", command);
-    let output = command.output().expect("Failed building the Docker image");
+    let output = command.spawn()?.wait_with_output().await?;
+
     if !output.status.success() {
         warn!(
-            "An error occured while building the Docker image:\n{}\n{}",
-            String::from_utf8(output.stdout).unwrap(),
-            String::from_utf8(output.stderr).unwrap()
+            "An error occured while building the Docker image:\n{}",
+            CommandError { command, output }
         )
     }
+    Ok(())
 }
 
-pub fn execute_compose_service_command(
-    service: &str,
-    cmd: &[&str],
-) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn execute_compose_service_command(service: &str, cmd: &[&str]) -> Result<String> {
     let mut command = create_compose_command();
 
     command.arg("exec").arg(service);
@@ -262,35 +262,15 @@ pub fn execute_compose_service_command(
         ()
     });
 
-    let output = command.output()?;
+    let output = command.output().await.map_err(Error::from)?;
 
     if !output.status.success() {
-        return Err(Error { command, output }.into());
+        return Err(Error::from(CommandError { command, output }));
     }
 
-    Ok(())
-}
-
-#[derive(Debug)]
-pub struct Error {
-    command: process::Command,
-    output: Output,
-}
-
-impl std::error::Error for Error {}
-
-impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        let output = self.output.clone();
-        write!(
-            f,
-            "docker-compose exec exited with code {}:\n\tcmd: {:?}\n\tstdout: {}\n\tstderr: {}",
-            output.status.code().unwrap(),
-            self.command,
-            String::from_utf8(output.stdout).unwrap(),
-            String::from_utf8(output.stderr).unwrap()
-        )
-    }
+    String::from_utf8(output.stdout)
+        .map(|name| name.trim().to_string())
+        .map_err(Error::from)
 }
 
 fn current_dir_name() -> Option<String> {
@@ -302,9 +282,12 @@ fn current_dir_name() -> Option<String> {
     }
 }
 
-pub fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
+pub async fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
     let default_app_image = current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string());
-    let default_app_tag = get_current_branch().unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
+    let default_app_tag = get_current_branch()
+        .await
+        .ok()
+        .unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
 
     if let Some(dev) = dev_conf {
         ServiceImages {
@@ -347,7 +330,7 @@ pub fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
     }
 }
 
-#[derive(clap::ValueEnum, Clone, Debug)]
+#[derive(clap::ValueEnum, Clone, Debug, PartialEq)]
 pub enum Service {
     App,
     Devtool,
@@ -364,20 +347,23 @@ impl Service {
             Service::Mongo => MONGO_SERVICE_NAME,
         }
     }
-
-    pub fn get_image(&self, images: &ServiceImages) -> String {
-        match self {
-            Service::App => images.app.clone(),
-            Service::Devtool => images.devtool.clone(),
-            Service::Postgres => images.postgres.clone(),
-            Service::Mongo => images.mongo.clone(),
-        }
-    }
 }
 
+#[derive(Clone, Debug)]
 pub struct ServiceImages {
     pub app: String,
     pub devtool: String,
     pub postgres: String,
     pub mongo: String,
 }
+
+impl ServiceImages {
+    pub fn get(&self, service: &Service) -> String {
+        match service {
+            Service::App => self.app.clone(),
+            Service::Devtool => self.devtool.clone(),
+            Service::Postgres => self.postgres.clone(),
+            Service::Mongo => self.mongo.clone(),
+        }
+    }
+}
diff --git a/src/errors.rs b/src/errors.rs
index 34afc44..30b0640 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,15 +1,57 @@
+use std::{process::Output, string::FromUtf8Error};
+
+use rustyline::error::ReadlineError;
 use thiserror::Error;
+use tokio::{process::Command, task::JoinError};
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Error, Debug)]
 pub enum Error {
-    #[error("Could not open file: {0}")]
-    OpenFile(#[from] std::io::Error),
-    #[error("Error while deserializing the JSON document: {0}")]
-    DeserializeJson(#[from] serde_json::Error),
-    #[error("Error while deserializing the YAML document: {0}")]
-    DeserializeYaml(#[from] serde_yaml::Error),
+    #[error("Could not open file {1}: {0}")]
+    OpenFile(std::io::Error, std::path::PathBuf),
+    #[error("StdIO error {0}")]
+    Stdio(#[from] std::io::Error),
+    #[error("Error while deserializing the document: {0}")]
+    Deserialize(#[from] serde_yaml::Error),
+    #[error("{0}")]
+    Dofigen(#[from] dofigen_lib::Error),
+    #[error("Could not read command: {0}")]
+    ReadLine(#[from] ReadlineError),
+    #[error("Could not parse command: {0}")]
+    ParseCommand(#[from] clap::Error),
+    #[error("Error while requesting: {0}")]
+    Request(#[from] ureq::Error),
+    #[error("Error while joining an async task: {0}")]
+    Join(#[from] JoinError),
+    #[error("The command execution failed: {0}")]
+    Command(#[from] CommandError),
+    #[error("{0}")]
+    FromUtf8(#[from] FromUtf8Error),
+    #[error("Check error")]
+    Check,
     #[error("{0}")]
     Custom(String),
 }
+
+#[derive(Debug)]
+pub struct CommandError {
+    pub command: Command,
+    pub output: Output,
+}
+
+impl std::error::Error for CommandError {}
+
+impl std::fmt::Display for CommandError {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let output = self.output.clone();
+        write!(
+            f,
+            "Command exec exited with code {}:\n\tcmd: {:?}\n\tstdout: {}\n\tstderr: {}",
+            output.status.code().unwrap(),
+            self.command,
+            String::from_utf8(output.stdout).unwrap(),
+            String::from_utf8(output.stderr).unwrap()
+        )
+    }
+}
diff --git a/src/git.rs b/src/git.rs
index c3dd9cd..8eab068 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -1,19 +1,21 @@
-use std::process::Command;
+use tokio::process::Command;
 
-pub fn get_current_branch() -> Option<String> {
-    let output = Command::new("git")
+use crate::errors::{CommandError, Error, Result};
+
+pub async fn get_current_branch() -> Result<String> {
+    let mut command = Command::new("git");
+    let output = command
         .arg("rev-parse")
         .arg("--abbrev-ref")
         .arg("HEAD")
-        .output();
+        .output()
+        .await?;
 
-    if let Ok(out) = output {
-        if out.status.success() {
-            return String::from_utf8(out.stdout)
-                .map(|name| name.trim().to_string())
-                .ok();
-        }
+    if !output.status.success() {
+        return Err(Error::Command(CommandError { command, output }));
     }
 
-    None
+    String::from_utf8(output.stdout)
+        .map(|name| name.trim().to_string())
+        .map_err(Error::from)
 }
diff --git a/src/main.rs b/src/main.rs
index 2c8b825..1da6f28 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,16 +5,20 @@
 use clap::Parser;
 use cli::{Cli, CliCommand};
 use env_logger;
+use errors::Result;
 
 mod cli;
 mod config;
+mod devtool;
 mod docker;
 mod docker_compose;
 mod errors;
 mod git;
+mod matching;
 
-fn main() {
+#[tokio::main]
+async fn main() -> Result<()> {
     env_logger::init();
     let args = Cli::parse();
-    args.command.run();
+    args.command.run().await
 }
diff --git a/src/matching.rs b/src/matching.rs
new file mode 100644
index 0000000..1d76f57
--- /dev/null
+++ b/src/matching.rs
@@ -0,0 +1,173 @@
+use serde_json::Value;
+
+#[derive(Clone)]
+pub enum MatchingErrorType {
+    NotSameType { actual: Value, expected: Value },
+    NotSameValue { actual: Value, expected: Value },
+    AdditionalProperty,
+    MissingProperty,
+}
+
+#[derive(Clone)]
+pub struct MatchingError {
+    pub path: String,
+    pub error_type: MatchingErrorType,
+}
+
+pub trait Matching {
+    fn match_type(&self, val: &Value) -> bool;
+    fn check_match(&self, expected: &Value) -> Vec<MatchingError>;
+    fn type_name(&self) -> &str;
+}
+
+impl Matching for Value {
+    fn match_type(&self, val: &Value) -> bool {
+        match self {
+            Value::Null => val.is_null(),
+            Value::Bool(_) => val.is_boolean(),
+            Value::Number(_) => val.is_number(),
+            Value::String(_) => val.is_string(),
+            Value::Array(_) => val.is_array(),
+            Value::Object(_) => val.is_object(),
+        }
+    }
+
+    fn check_match(&self, expected: &Value) -> Vec<MatchingError> {
+        if expected == self {
+            return vec![];
+        }
+        if !self.match_type(expected) {
+            return vec![MatchingError {
+                path: "".into(),
+                error_type: MatchingErrorType::NotSameType {
+                    actual: self.clone(),
+                    expected: expected.clone(),
+                },
+            }];
+        }
+
+        match self {
+            Value::Array(array) => {
+                let expected_array = expected.as_array().unwrap();
+                let mut ret: Vec<MatchingError> = vec![];
+                let common_length = if array.len() > expected_array.len() {
+                    expected_array.len()
+                } else {
+                    array.len()
+                };
+
+                for i in 0..common_length {
+                    let v = array.get(i).unwrap();
+                    let expected_v = expected_array.get(i).unwrap();
+                    v.check_match(expected_v)
+                        .iter()
+                        .map(|error| MatchingError {
+                            path: if error.path.is_empty() {
+                                format!("{}", i)
+                            } else {
+                                format!("{}.{}", i, error.path)
+                            },
+                            error_type: error.error_type.clone(),
+                        })
+                        .for_each(|error| ret.push(error));
+                }
+                for i in common_length..array.len() {
+                    ret.push(MatchingError {
+                        path: format!("{}", i),
+                        error_type: MatchingErrorType::AdditionalProperty,
+                    });
+                }
+                for i in common_length..expected_array.len() {
+                    ret.push(MatchingError {
+                        path: format!("{}", i),
+                        error_type: MatchingErrorType::MissingProperty,
+                    });
+                }
+
+                ret
+            }
+            Value::Object(object) => {
+                let expected_object = expected.as_object().unwrap();
+                let keys = object.keys();
+                let expected_keys = expected_object.keys();
+                let mut ret: Vec<MatchingError> = vec![];
+
+                expected_keys.for_each(|key| {
+                    if object.contains_key(key) {
+                        let value = object.get(key).unwrap();
+                        let expected_value = expected_object.get(key).unwrap();
+                        value
+                            .check_match(expected_value)
+                            .iter()
+                            .map(|error| MatchingError {
+                                path: if error.path.is_empty() {
+                                    key.into()
+                                } else {
+                                    format!("{}.{}", key, error.path)
+                                },
+                                error_type: error.error_type.clone(),
+                            })
+                            .for_each(|error| ret.push(error));
+                    } else {
+                        ret.push(MatchingError {
+                            path: key.into(),
+                            error_type: MatchingErrorType::MissingProperty,
+                        });
+                    }
+                });
+
+                keys.for_each(|key| {
+                    if !expected_object.contains_key(key) {
+                        ret.push(MatchingError {
+                            path: key.into(),
+                            error_type: MatchingErrorType::AdditionalProperty,
+                        });
+                    }
+                });
+
+                ret
+            }
+            Value::Number(number) => {
+                let result = if number.is_f64() || expected.is_f64() {
+                    number.as_f64().unwrap().eq(&expected.as_f64().unwrap())
+                } else if number.is_i64() || expected.is_i64() {
+                    number.as_i64().unwrap().eq(&expected.as_i64().unwrap())
+                } else {
+                    number.as_u64().unwrap().eq(&expected.as_u64().unwrap())
+                };
+
+                if !result {
+                    vec![MatchingError {
+                        path: "".into(),
+                        error_type: MatchingErrorType::NotSameValue {
+                            actual: self.clone(),
+                            expected: expected.clone(),
+                        },
+                    }]
+                } else {
+                    vec![]
+                }
+            }
+            Value::Null => panic!("Should not be reached"),
+            // Since equality have been tested before
+            _ => vec![MatchingError {
+                path: "".into(),
+                error_type: MatchingErrorType::NotSameValue {
+                    actual: self.clone(),
+                    expected: expected.clone(),
+                },
+            }],
+        }
+    }
+
+    fn type_name(&self) -> &str {
+        match self {
+            Value::Null => "null",
+            Value::Bool(_) => "bool",
+            Value::Number(_) => "number",
+            Value::String(_) => "string",
+            Value::Array(_) => "array",
+            Value::Object(_) => "object",
+        }
+    }
+}

From 1ba2d08ac8871479da9ca9952efed76bdad438d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 17:44:29 +0100
Subject: [PATCH 30/76] build(deps): bump env_logger from 0.9.3 to 0.10.0
 (#121)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 18 +++++++++++++++---
 Cargo.toml |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2335ed4..3e19f90 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -380,12 +380,12 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "env_logger"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
- "atty",
  "humantime",
+ "is-terminal",
  "log",
  "regex",
  "termcolor",
@@ -566,6 +566,18 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.5"
diff --git a/Cargo.toml b/Cargo.toml
index ce758d7..0f98c2e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9.2"
 log = "0.4.17"
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"

From fe41ec18083f27c15884f8f6bdc748695cf20a72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 17:52:05 +0100
Subject: [PATCH 31/76] build(deps): bump ureq from 2.5.0 to 2.6.1 (#122)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 11 ++---------
 Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3e19f90..47709c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -105,12 +105,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "chunked_transfer"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a"
-
 [[package]]
 name = "clap"
 version = "3.2.23"
@@ -1221,12 +1215,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
+checksum = "733b5ad78377302af52c0dbcb2623d78fe50e4b3bf215948ff29e9ee031d8566"
 dependencies = [
  "base64",
- "chunked_transfer",
  "flate2",
  "log",
  "once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index 0f98c2e..d2680fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,6 +36,6 @@ dirs = "4.0.0"
 chrono = "0.4.22"
 thiserror = "1.0.37"
 colored = "2.0.0"
-ureq = { version = "2.5.0", features = ["json"] }
+ureq = { version = "2.6.1", features = ["json"] }
 tokio = { version = "1.23.0", features = ["full"] }
 async-trait = "0.1.60"

From 795f0979f09fab5c4b4bedbc626d0555d33f20d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 20:16:09 +0100
Subject: [PATCH 32/76] build(deps): bump open from 1.7.1 to 3.2.0 (#124)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 6 +++---
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47709c4..dc3b093 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -742,12 +742,12 @@ checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "open"
-version = "1.7.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcea7a30d6b81a2423cc59c43554880feff7b57d12916f231a79f8d6d9470201"
+checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
 dependencies = [
  "pathdiff",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d2680fd..762c310 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ regex = "1.6.0"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
 docker-compose-types = "0.2.2"
-open = "1"
+open = "3"
 rustyline = "10.0.0"
 dirs = "4.0.0"
 chrono = "0.4.22"

From 14617fdb967416c8b03082d9baf35d167ab237ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 20:36:21 +0100
Subject: [PATCH 33/76] build(deps): bump docker-compose-types from 0.2.4 to
 0.3.1 (#123)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas DA ROCHA <thomas.darocha@lenra.io>
---
 Cargo.lock            |  4 ++--
 Cargo.toml            |  2 +-
 src/docker_compose.rs | 53 +++++++++++++++++++++++++++----------------
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc3b093..9a67603 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -344,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "docker-compose-types"
-version = "0.2.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0900732e214525bab1bfa1ed134f3397938d978c9d09d67387147680fbcb129c"
+checksum = "dea8ee12b14b39b3b93ef2affdb686dcef5c349bfc58da31a0f0b5001cfb7154"
 dependencies = [
  "derive_builder",
  "indexmap",
diff --git a/Cargo.toml b/Cargo.toml
index 762c310..b976ebf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ env_logger = "0.10.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
-docker-compose-types = "0.2.2"
+docker-compose-types = "0.3.1"
 open = "3"
 rustyline = "10.0.0"
 dirs = "4.0.0"
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index e40c7a2..8b7f25e 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -1,5 +1,5 @@
 use docker_compose_types::{
-    AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions,
+    AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions, EnvTypes,
     Environment, Healthcheck, HealthcheckTest, Services,
 };
 use log::warn;
@@ -50,45 +50,58 @@ async fn generate_docker_compose_content(
     dev_conf: &Option<Dev>,
     exposed_services: Vec<Service>,
 ) -> Result<String> {
-    let mut devtool_env_vec: Vec<(String, Option<String>)> = vec![
-        ("POSTGRES_USER".to_string(), Some("postgres".to_string())),
+    let mut devtool_env_vec: Vec<(String, Option<EnvTypes>)> = vec![
         (
-            "POSTGRES_PASSWORD".to_string(),
-            Some("postgres".to_string()),
+            "POSTGRES_USER".into(),
+            Some(EnvTypes::String("postgres".into())),
+        ),
+        (
+            "POSTGRES_PASSWORD".into(),
+            Some(EnvTypes::String("postgres".into())),
+        ),
+        (
+            "POSTGRES_DB".into(),
+            Some(EnvTypes::String("lenra_devtool".into())),
         ),
-        ("POSTGRES_DB".to_string(), Some("lenra_devtool".to_string())),
     ];
-    let postgres_envs: [(String, Option<String>); 3] = devtool_env_vec.clone().try_into().unwrap();
+    let postgres_envs: [(String, Option<EnvTypes>); 3] =
+        devtool_env_vec.clone().try_into().unwrap();
 
     devtool_env_vec.push((
-        "POSTGRES_HOST".to_string(),
-        Some(POSTGRES_SERVICE_NAME.to_string()),
+        "POSTGRES_HOST".into(),
+        Some(EnvTypes::String(POSTGRES_SERVICE_NAME.into())),
     ));
     devtool_env_vec.push((
-        "OF_WATCHDOG_URL".to_string(),
-        Some(format!("http://{}:{}", APP_SERVICE_NAME, OF_WATCHDOG_PORT)),
+        "OF_WATCHDOG_URL".into(),
+        Some(EnvTypes::String(format!(
+            "http://{}:{}",
+            APP_SERVICE_NAME, OF_WATCHDOG_PORT
+        ))),
     ));
     devtool_env_vec.push((
-        "LENRA_API_URL".to_string(),
-        Some(format!("http://{}:{}", DEVTOOL_SERVICE_NAME, DEVTOOL_PORT)),
+        "LENRA_API_URL".into(),
+        Some(EnvTypes::String(format!(
+            "http://{}:{}",
+            DEVTOOL_SERVICE_NAME, DEVTOOL_PORT
+        ))),
     ));
     devtool_env_vec.push((
-        "MONGO_HOSTNAME".to_string(),
-        Some(MONGO_SERVICE_NAME.to_string()),
+        "MONGO_HOSTNAME".into(),
+        Some(EnvTypes::String(MONGO_SERVICE_NAME.into())),
     ));
-    let devtool_envs: [(String, Option<String>); 7] = devtool_env_vec.try_into().unwrap();
+    let devtool_envs: [(String, Option<EnvTypes>); 7] = devtool_env_vec.try_into().unwrap();
 
-    let mongo_envs: [(String, Option<String>); 2] = [
+    let mongo_envs: [(String, Option<EnvTypes>); 2] = [
         (
             "MONGO_INITDB_DATABASE".to_string(),
-            Some("test".to_string()),
+            Some(EnvTypes::String("test".into())),
         ),
         (
             "CONFIG".to_string(),
-            Some(format!(
+            Some(EnvTypes::String(format!(
                 r#"{{"_id" : "rs0", "members" : [{{"_id" : 0,"host" : "{}:{}"}}]}}"#,
                 MONGO_SERVICE_NAME, MONGO_PORT
-            )),
+            ))),
         ),
     ];
 

From 3de17214f2cb307bbbeb180646a34cb18c857263 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Thu, 5 Jan 2023 10:57:28 +0100
Subject: [PATCH 34/76] feat: Non root user for app (#126)

---
 src/docker_compose.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 8b7f25e..8f34910 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -31,6 +31,7 @@ pub const OF_WATCHDOG_PORT: u16 = 8080;
 pub const DEVTOOL_PORT: u16 = 4000;
 pub const MONGO_PORT: u16 = 27017;
 pub const POSTGRES_PORT: u16 = 5432;
+pub const NON_ROOT_USER: &str = "12000";
 
 /// Generates the docker-compose.yml file
 pub async fn generate_docker_compose(
@@ -120,6 +121,7 @@ async fn generate_docker_compose_content(
                             dockerfile: Some(dockerfile.to_str().unwrap().into()),
                             ..Default::default()
                         })),
+                        user: Some(NON_ROOT_USER.into()),
                         // TODO: Add resources management  when managed by the docker-compose-types lib
                         ..Default::default()
                     }),

From dae6c623ec3008aa915229750e6ef09c24eeeb79 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 6 Jan 2023 11:33:32 +0100
Subject: [PATCH 35/76] feat!: Docker images in dev config (#131)

---
 src/config.rs         | 45 +++++++++++++++++---------
 src/docker_compose.rs | 73 ++++++++++++++++++++-----------------------
 2 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 6ed902f..54363c2 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, fs, path::PathBuf};
 
 use dofigen_lib::{
-    from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder, Image,
+    self, from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder,
 };
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
@@ -54,14 +54,19 @@ pub struct Application {
 }
 
 /** The dev specific configuration */
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
-#[serde(rename_all = "camelCase")]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 pub struct Dev {
-    pub app_name: Option<String>,
-    pub app_tag: Option<String>,
-    pub devtool_tag: Option<String>,
-    pub postgres_tag: Option<String>,
-    pub mongo_tag: Option<String>,
+    pub app: Option<Image>,
+    pub devtool: Option<Image>,
+    pub postgres: Option<Image>,
+    pub mongo: Option<Image>,
+}
+
+/** A Docker image */
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
+pub struct Image {
+    pub image: Option<String>,
+    pub tag: Option<String>,
 }
 
 /** The application generator configuration */
@@ -79,7 +84,7 @@ pub enum Generator {
 /** The Dofigen configuration */
 #[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
 pub struct Dofigen {
-    pub dofigen: Image,
+    pub dofigen: dofigen_lib::Image,
 }
 
 /** The Dofigen configuration file */
@@ -148,7 +153,7 @@ impl Application {
     }
 
     /// Builds a Docker image from a Dofigen structure
-    fn build_dofigen(&self, image: Image) -> Result<()> {
+    fn build_dofigen(&self, image: dofigen_lib::Image) -> Result<()> {
         // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
         let of_overlay = self.dofigen_of_overlay(image)?;
 
@@ -159,7 +164,7 @@ impl Application {
     }
 
     /// Add an overlay to the given Dofigen structure to manage OpenFaaS
-    fn dofigen_of_overlay(&self, image: Image) -> Result<Image> {
+    fn dofigen_of_overlay(&self, image: dofigen_lib::Image) -> Result<dofigen_lib::Image> {
         log::info!("Adding OpenFaaS overlay to the Dofigen descriptor");
         let mut builders = if let Some(vec) = image.builders {
             vec
@@ -219,7 +224,7 @@ impl Application {
             ));
         }
 
-        Ok(Image {
+        Ok(dofigen_lib::Image {
             image: image.image,
             builders: Some(builders),
             artifacts: Some(artifacts),
@@ -267,12 +272,12 @@ mod dofigen_of_overlay_tests {
 
     #[test]
     fn simple_image() {
-        let image = Image {
+        let image = dofigen_lib::Image {
             image: "my-dockerimage".into(),
             cmd: Some(vec!["/app/my-app".into()]),
             ..Default::default()
         };
-        let overlayed_image = Image {
+        let overlayed_image = dofigen_lib::Image {
             builders: Some(vec![Builder {
                 name: Some("of-watchdog".into()),
                 image: format!("ghcr.io/openfaas/of-watchdog:{}", OF_WATCHDOG_VERSION),
@@ -309,7 +314,7 @@ mod dofigen_of_overlay_tests {
     #[test]
     #[should_panic]
     fn no_cmd() {
-        let image = Image {
+        let image = dofigen_lib::Image {
             image: "my-dockerimage".into(),
             ..Default::default()
         };
@@ -323,3 +328,13 @@ mod dofigen_of_overlay_tests {
         config.dofigen_of_overlay(image).unwrap();
     }
 }
+
+impl Image {
+    pub fn to_image(&self, default_image: &str, default_tag: &str) -> String {
+        format!(
+            "{}:{}",
+            self.image.clone().unwrap_or(default_image.to_string()),
+            self.tag.clone().unwrap_or(default_tag.to_string())
+        )
+    }
+}
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 8f34910..10b1cee 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -7,6 +7,7 @@ use std::process::Stdio;
 use std::{convert::TryInto, env, fs, path::PathBuf};
 use tokio::process;
 
+use crate::config::Image;
 use crate::errors::Error;
 use crate::{
     config::{Dev, DOCKERCOMPOSE_DEFAULT_PATH},
@@ -298,50 +299,44 @@ fn current_dir_name() -> Option<String> {
 }
 
 pub async fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
-    let default_app_image = current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string());
+    let default_app_image = format!(
+        "{}{}",
+        APP_BASE_IMAGE,
+        current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string())
+    );
     let default_app_tag = get_current_branch()
         .await
         .ok()
         .unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
 
-    if let Some(dev) = dev_conf {
-        ServiceImages {
-            app: format!(
-                "{}{}:{}",
-                APP_BASE_IMAGE,
-                dev.app_name.clone().unwrap_or(default_app_image),
-                dev.app_tag.clone().unwrap_or(default_app_tag)
-            ),
-            devtool: format!(
-                "{}:{}",
-                DEVTOOL_IMAGE,
-                dev.devtool_tag
-                    .clone()
-                    .unwrap_or(DEVTOOL_DEFAULT_TAG.to_string())
-            ),
-            postgres: format!(
-                "{}:{}",
-                POSTGRES_IMAGE,
-                dev.postgres_tag
-                    .clone()
-                    .unwrap_or(POSTGRES_IMAGE_TAG.to_string())
-            ),
-            mongo: format!(
-                "{}:{}",
-                MONGO_IMAGE,
-                dev.mongo_tag.clone().unwrap_or(MONGO_IMAGE_TAG.to_string())
-            ),
-        }
-    } else {
-        ServiceImages {
-            app: format!(
-                "{}{}:{}",
-                APP_BASE_IMAGE, default_app_image, default_app_tag
-            ),
-            devtool: format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG),
-            postgres: format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG),
-            mongo: format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG),
-        }
+    let dev = dev_conf.clone().unwrap_or(Dev {
+        ..Default::default()
+    });
+    ServiceImages {
+        app: dev
+            .app
+            .unwrap_or(Image {
+                ..Default::default()
+            })
+            .to_image(&default_app_image, &default_app_tag),
+        devtool: dev
+            .devtool
+            .unwrap_or(Image {
+                ..Default::default()
+            })
+            .to_image(DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG),
+        postgres: dev
+            .postgres
+            .unwrap_or(Image {
+                ..Default::default()
+            })
+            .to_image(POSTGRES_IMAGE, POSTGRES_IMAGE_TAG),
+        mongo: dev
+            .mongo
+            .unwrap_or(Image {
+                ..Default::default()
+            })
+            .to_image(MONGO_IMAGE, MONGO_IMAGE_TAG),
     }
 }
 

From 71f48f5123f7ea02d22faa240e0893fabec7fc19 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 6 Jan 2023 16:16:58 +0100
Subject: [PATCH 36/76] feat: Define app memory limit (#127)

---
 Cargo.lock            |  4 ++--
 Cargo.toml            |  2 +-
 src/docker_compose.rs | 19 +++++++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a67603..307ffcd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -344,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "docker-compose-types"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea8ee12b14b39b3b93ef2affdb686dcef5c349bfc58da31a0f0b5001cfb7154"
+checksum = "ffef37a71a18d9f4b5153f32c5e28bfca03f5f2b87c2821eea1a42097158ce0f"
 dependencies = [
  "derive_builder",
  "indexmap",
diff --git a/Cargo.toml b/Cargo.toml
index b976ebf..f5852fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ env_logger = "0.10.0"
 regex = "1.6.0"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
-docker-compose-types = "0.3.1"
+docker-compose-types = "0.4.0"
 open = "3"
 rustyline = "10.0.0"
 dirs = "4.0.0"
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 10b1cee..3ba5911 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -1,6 +1,6 @@
 use docker_compose_types::{
-    AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions, EnvTypes,
-    Environment, Healthcheck, HealthcheckTest, Services,
+    AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions, Deploy,
+    EnvTypes, Environment, Healthcheck, HealthcheckTest, Limits, Resources, Services,
 };
 use log::warn;
 use std::process::Stdio;
@@ -33,6 +33,8 @@ pub const DEVTOOL_PORT: u16 = 4000;
 pub const MONGO_PORT: u16 = 27017;
 pub const POSTGRES_PORT: u16 = 5432;
 pub const NON_ROOT_USER: &str = "12000";
+const MEMORY_RESERVATION: &str = "128M";
+const MEMORY_LIMIT: &str = "256M";
 
 /// Generates the docker-compose.yml file
 pub async fn generate_docker_compose(
@@ -123,6 +125,19 @@ async fn generate_docker_compose_content(
                             ..Default::default()
                         })),
                         user: Some(NON_ROOT_USER.into()),
+                        deploy: Some(Deploy {
+                            resources: Some(Resources {
+                            limits: Some(Limits {
+                                memory: Some(MEMORY_LIMIT.into()),
+                                ..Default::default()
+                            }),
+                            reservations: Some(Limits {
+                                memory: Some(MEMORY_RESERVATION.into()),
+                                ..Default::default()
+                            })
+                        }),
+                        ..Default::default()
+                     }),
                         // TODO: Add resources management  when managed by the docker-compose-types lib
                         ..Default::default()
                     }),

From 8d9209b57216ec99d0e5e392a62dd83a562d3dae Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:17:08 +0100
Subject: [PATCH 37/76] ci: Binary in root dir of tar archives (#137)

---
 .github/workflows/build_ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
index 3bcef51..39cd1bf 100644
--- a/.github/workflows/build_ci.yml
+++ b/.github/workflows/build_ci.yml
@@ -164,7 +164,7 @@ jobs:
     - name: Zip
       if: ${{ matrix.os != 'windows' }}
       shell: bash
-      run: tar -czf "lenra-${{ matrix.os }}-${{ matrix.arch }}.tar.gz" "target/${{ matrix.target }}/release/lenra${{ matrix.file_extension }}"
+      run: tar -C "target/${{ matrix.target }}/release" -czf "lenra-${{ matrix.os }}-${{ matrix.arch }}.tar.gz" "lenra${{ matrix.file_extension }}"
 
     - name: Upload
       uses: actions/upload-artifact@v3

From 5964c0b0505cf644b6caf39fd746f34276597220 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:24:33 +0100
Subject: [PATCH 38/76] build(deps): bump async-trait from 0.1.60 to 0.1.61
 (#134)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 307ffcd..98b0953 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,9 +28,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
+checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index f5852fe..e2fc648 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,4 +38,4 @@ thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.1", features = ["json"] }
 tokio = { version = "1.23.0", features = ["full"] }
-async-trait = "0.1.60"
+async-trait = "0.1.61"

From f4e418476d8135d13cb768519580c9a10c1b7a29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:25:59 +0100
Subject: [PATCH 39/76] build(deps): bump regex from 1.7.0 to 1.7.1 (#135)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 98b0953..c5479b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -871,9 +871,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index e2fc648..80ed3da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ serde_json = "1.0"
 serde_yaml = "0.9.2"
 log = "0.4.17"
 env_logger = "0.10.0"
-regex = "1.6.0"
+regex = "1.7.1"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
 docker-compose-types = "0.4.0"

From 8ac6c9115a593c475729a84bbc97540cb560fa8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 21:24:19 +0100
Subject: [PATCH 40/76] build(deps): bump tokio from 1.23.0 to 1.24.1 (#136)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c5479b3..0ca0399 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1139,9 +1139,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.23.0"
+version = "1.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 80ed3da..a3f26d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,5 +37,5 @@ chrono = "0.4.22"
 thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.1", features = ["json"] }
-tokio = { version = "1.23.0", features = ["full"] }
+tokio = { version = "1.24.1", features = ["full"] }
 async-trait = "0.1.61"

From a5df28b02d1c6813c32527cf7e5a847fe437693f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 16:40:42 +0100
Subject: [PATCH 41/76] build(deps): bump rustyline from 10.0.0 to 10.1.0
 (#142)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 15 +++++++++++----
 Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ca0399..6d1e3b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -696,13 +696,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
 dependencies = [
  "bitflags",
  "cfg-if",
  "libc",
+ "static_assertions",
 ]
 
 [[package]]
@@ -929,9 +930,9 @@ dependencies = [
 
 [[package]]
 name = "rustyline"
-version = "10.0.0"
+version = "10.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e"
+checksum = "5fc2d30f0bb29c4308f902d4a147b2d6cb022b59771463d9785f37e21f544df7"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1053,6 +1054,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "str-buf"
 version = "1.0.6"
diff --git a/Cargo.toml b/Cargo.toml
index a3f26d2..0f2d95e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ lazy_static = "1.4.0"
 dofigen = "1.2.0"
 docker-compose-types = "0.4.0"
 open = "3"
-rustyline = "10.0.0"
+rustyline = "10.1.0"
 dirs = "4.0.0"
 chrono = "0.4.22"
 thiserror = "1.0.37"

From b3c1d70b0d1b9bb7a496709a0f022eab7806fb60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jan 2023 16:45:35 +0100
Subject: [PATCH 42/76] build(deps): bump ureq from 2.6.1 to 2.6.2 (#141)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d1e3b5..0d53525 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1222,9 +1222,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.6.1"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733b5ad78377302af52c0dbcb2623d78fe50e4b3bf215948ff29e9ee031d8566"
+checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d"
 dependencies = [
  "base64",
  "flate2",
diff --git a/Cargo.toml b/Cargo.toml
index 0f2d95e..337a372 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,6 +36,6 @@ dirs = "4.0.0"
 chrono = "0.4.22"
 thiserror = "1.0.37"
 colored = "2.0.0"
-ureq = { version = "2.6.1", features = ["json"] }
+ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.24.1", features = ["full"] }
 async-trait = "0.1.61"

From ccc3889bf66b3be3e861a29e778828f1f5fa9162 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 24 Jan 2023 10:30:24 +0100
Subject: [PATCH 43/76] feat: Interactive command shortcurts (#143)

---
 Cargo.lock                                    |  89 ++++--
 Cargo.toml                                    |   1 +
 docs/check.md                                 |   2 +-
 docs/{check-template.md => check/template.md} |   0
 docs/dev.md                                   |  40 +--
 docs/{dev-continue.md => dev/continue.md}     |   0
 docs/{dev-expose.md => dev/expose.md}         |   0
 docs/dev/interactive.md                       |  13 +
 docs/{dev-reload.md => dev/reload.md}         |   0
 docs/dev/terminal.md                          |  39 +++
 src/cli/build.rs                              |  17 +-
 src/cli/dev/interactive.rs                    | 127 +++++++++
 src/cli/{dev.rs => dev/mod.rs}                |  20 +-
 src/cli/dev/terminal.rs                       | 263 ++++++++++++++++++
 src/cli/interactive.rs                        | 239 ----------------
 src/cli/logs.rs                               |   2 +-
 src/cli/mod.rs                                |   1 -
 src/cli/new.rs                                |   4 +
 src/config.rs                                 |   4 +-
 src/devtool.rs                                |   4 +
 src/docker.rs                                 |   2 +-
 src/docker_compose.rs                         |  49 +++-
 src/git.rs                                    |   1 +
 src/keyboard_event.rs                         | 127 +++++++++
 src/main.rs                                   |   1 +
 25 files changed, 710 insertions(+), 335 deletions(-)
 rename docs/{check-template.md => check/template.md} (100%)
 rename docs/{dev-continue.md => dev/continue.md} (100%)
 rename docs/{dev-expose.md => dev/expose.md} (100%)
 create mode 100644 docs/dev/interactive.md
 rename docs/{dev-reload.md => dev/reload.md} (100%)
 create mode 100644 docs/dev/terminal.md
 create mode 100644 src/cli/dev/interactive.rs
 rename src/cli/{dev.rs => dev/mod.rs} (75%)
 create mode 100644 src/cli/dev/terminal.rs
 delete mode 100644 src/cli/interactive.rs
 create mode 100644 src/keyboard_event.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0d53525..680bdfa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,9 +146,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.4.2"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219"
+checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
 dependencies = [
  "error-code",
  "str-buf",
@@ -193,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
+checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -205,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
+checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -220,15 +220,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
+checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
+checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -552,9 +552,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
  "windows-sys",
@@ -613,6 +613,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
+ "strum",
  "thiserror",
  "tokio",
  "ureq",
@@ -769,9 +770,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
 dependencies = [
  "cfg-if",
  "libc",
@@ -918,9 +919,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
 dependencies = [
  "log",
  "ring",
@@ -928,6 +929,12 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+
 [[package]]
 name = "rustyline"
 version = "10.1.0"
@@ -1072,6 +1079,28 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strum"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.107"
@@ -1404,42 +1433,42 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
diff --git a/Cargo.toml b/Cargo.toml
index 337a372..c5269db 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,3 +39,4 @@ colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.24.1", features = ["full"] }
 async-trait = "0.1.61"
+strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
diff --git a/docs/check.md b/docs/check.md
index 47f427e..a5d88c1 100644
--- a/docs/check.md
+++ b/docs/check.md
@@ -22,4 +22,4 @@ SUBCOMMANDS:
 
 This tool contains many subcommands to help you doing what you need.
 
-- [template](docs/check-template.md): checks the current project as a template
\ No newline at end of file
+- [template](docs/check/template.md): checks the current project as a template
\ No newline at end of file
diff --git a/docs/check-template.md b/docs/check/template.md
similarity index 100%
rename from docs/check-template.md
rename to docs/check/template.md
diff --git a/docs/dev.md b/docs/dev.md
index 599176b..3d1f0fc 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -16,44 +16,10 @@ OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
         --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
     -h, --help               Print help information
+    -t, --terminal           Open the dev terminal instead of starting the interactive mode
 ```
 
-When the CLI receive a `Ctrl + C` signal while displaying logs in dev mode, it displays an [interactive command prompt](#interactive-commands).
+While displaying logs in dev mode, you can run some [interactive commands](dev/interactive.md) by pressing the good keys.
+You also can press `Ctrl + C` to start our [dev terminal](dev/terminal.md).
 
-## Interactive commands
 
-Here is the `help` interactive command result:
-
-```bash
-[lenra]$ help
-lenra_cli 
-The Lenra interactive command line interface
-
-USAGE:
-    lenra <SUBCOMMAND>
-
-OPTIONS:
-    -h, --help    Print help information
-
-SUBCOMMANDS:
-    check       Checks the running app
-    continue    Continue the previous logs command since the last displayed logs
-    exit        stop alias. Stop your app previously started with the start command
-    expose      Exposes the app ports
-    help        Print this message or the help of the given subcommand(s)
-    logs        View output from the containers
-    reload      Reload the app by rebuilding and restarting it
-    stop        Stop your app previously started with the start command
-```
-
-### Subcommands
-
-This tools contains many subcommands to help you do what you need.
-
-- [continue](docs/dev-continue.md): continues the previous logs command since the last displayed logs
-- [reload](docs/dev-reload.md): reloads the app by rebuilding and restarting it
-- [stop](docs/stop.md): stops your app previously started with the start command
-- [exit](docs/stop.md): `stop` alias
-- [expose](docs/dev-expose.md): exposes the app ports
-- [logs](docs/logs.md): displays output from the containers
-- [check](docs/check.md): checks the running app
diff --git a/docs/dev-continue.md b/docs/dev/continue.md
similarity index 100%
rename from docs/dev-continue.md
rename to docs/dev/continue.md
diff --git a/docs/dev-expose.md b/docs/dev/expose.md
similarity index 100%
rename from docs/dev-expose.md
rename to docs/dev/expose.md
diff --git a/docs/dev/interactive.md b/docs/dev/interactive.md
new file mode 100644
index 0000000..9341022
--- /dev/null
+++ b/docs/dev/interactive.md
@@ -0,0 +1,13 @@
+# Interactive commands
+
+When displaying logs in dev mode with the follow option (with [`lenra dev`](../dev.md)), you can run interactive commands through keyboard shortcuts.
+
+Here is the help interactive command result displayed pressing `H` key:
+
+```
+SHORTCUTS: (Command  Key(s)  Description)
+    Help      H                Print this message
+    Reload    R                Reload the app by rebuilding and restarting it
+    Quit      Q, Ctrl+C        Quit the interactive mode and open the Lenra dev terminal
+    Stop      S                Stop your app and the local Lenra environment
+```
\ No newline at end of file
diff --git a/docs/dev-reload.md b/docs/dev/reload.md
similarity index 100%
rename from docs/dev-reload.md
rename to docs/dev/reload.md
diff --git a/docs/dev/terminal.md b/docs/dev/terminal.md
new file mode 100644
index 0000000..3da1587
--- /dev/null
+++ b/docs/dev/terminal.md
@@ -0,0 +1,39 @@
+# Dev terminal
+
+The dev terminal is a command prompt that let  you run only Lenra specific commands. It has his own history.
+
+Here is the `help` command result of the dev terminal:
+
+```bash
+[lenra]$ help
+lenra_cli 
+The Lenra interactive command line interface
+
+USAGE:
+    lenra <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    check       Checks the running app
+    continue    Continue the previous logs command since the last displayed logs
+    exit        stop alias. Stop your app previously started with the start command
+    expose      Exposes the app ports
+    help        Print this message or the help of the given subcommand(s)
+    logs        View output from the containers
+    reload      Reload the app by rebuilding and restarting it
+    stop        Stop your app previously started with the start command
+```
+
+## Subcommands
+
+This tools contains many subcommands to help you do what you need.
+
+- [continue](./continue.md): continues the previous logs command since the last displayed logs
+- [reload](./reload.md): reloads the app by rebuilding and restarting it
+- [stop](../stop.md): stops your app previously started with the start command
+- [exit](../stop.md): `stop` alias
+- [expose](./expose.md): exposes the app ports
+- [logs](../logs.md): displays output from the containers
+- [check](../check.md): checks the running app
\ No newline at end of file
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 927ffae..b1a869f 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -19,18 +19,6 @@ pub struct Build {
     pub expose: Vec<Service>,
 }
 
-impl Build {
-    /// Builds a Dockerfile. If None, get's it at the default path: ./.lenra/Dockerfile
-    async fn build_docker_compose(&self) -> Result<()> {
-        log::info!("Build the Docker image");
-
-        compose_build().await?;
-
-        log::info!("Image built");
-        Ok(())
-    }
-}
-
 #[async_trait]
 impl CliCommand for Build {
     async fn run(&self) -> Result<()> {
@@ -39,8 +27,9 @@ impl CliCommand for Build {
 
         conf.generate_files(self.expose.clone()).await?;
 
-        // self.build_docker_image(conf);
-        self.build_docker_compose().await?;
+        log::info!("Build the Docker image");
+        compose_build().await?;
+        log::info!("Image built");
         Ok(())
     }
 }
diff --git a/src/cli/dev/interactive.rs b/src/cli/dev/interactive.rs
new file mode 100644
index 0000000..d27fa10
--- /dev/null
+++ b/src/cli/dev/interactive.rs
@@ -0,0 +1,127 @@
+use super::terminal::{DevCli, DevTermCommand};
+use crate::{
+    errors::Result,
+    keyboard_event::{keyevent_to_string, KeyEventListener, KeyboardListener},
+};
+use clap::CommandFactory;
+pub use clap::{Args, Parser, Subcommand};
+use colored::{Color, Colorize};
+use lazy_static::__Deref;
+use log::debug;
+use rustyline::{Cmd, KeyCode, KeyEvent, Modifiers, Movement};
+use std::sync::{Arc, Mutex};
+use strum::{Display, EnumIter, IntoEnumIterator};
+
+const ENTER_EVENT: KeyEvent = KeyEvent(KeyCode::Enter, Modifiers::NONE);
+
+pub trait KeyboardShorcut<T> {
+    fn about(&self) -> String;
+    fn events(&self) -> Vec<KeyEvent>;
+    fn run(&self) -> Option<T>;
+}
+
+#[derive(EnumIter, Display, Debug, PartialEq, Clone)]
+pub enum InteractiveCommand {
+    Help,
+    Reload,
+    Quit,
+    Stop,
+}
+
+impl InteractiveCommand {
+    pub fn name(&self) -> String {
+        format!("{}", self)
+    }
+}
+
+impl KeyboardShorcut<DevTermCommand> for InteractiveCommand {
+    fn about(&self) -> String {
+        match self {
+            InteractiveCommand::Help => "Print this message".into(),
+            InteractiveCommand::Quit => {
+                "Quit the interactive mode and open the Lenra dev terminal".into()
+            }
+            _ => {
+                let main_command = DevCli::command();
+                let command = main_command.find_subcommand(self.name().to_lowercase().as_str());
+                command.unwrap().get_about().unwrap().into()
+            }
+        }
+    }
+
+    fn events(&self) -> Vec<KeyEvent> {
+        match self {
+            InteractiveCommand::Quit => vec![
+                KeyEvent(KeyCode::Char('q'), Modifiers::NONE),
+                KeyEvent(KeyCode::Char('C'), Modifiers::CTRL),
+            ],
+            _ => {
+                let name = format!("{}", self);
+                vec![KeyEvent::new(
+                    name.to_lowercase().chars().next().unwrap(),
+                    Modifiers::NONE,
+                )]
+            }
+        }
+    }
+
+    fn run(&self) -> Option<DevTermCommand> {
+        match self {
+            InteractiveCommand::Help => {
+                display_help();
+                Some(DevTermCommand::Continue)
+            }
+            InteractiveCommand::Reload => Some(DevTermCommand::Reload),
+            InteractiveCommand::Quit => None,
+            InteractiveCommand::Stop => Some(DevTermCommand::Stop),
+        }
+    }
+}
+
+pub async fn listen_interactive_command() -> Result<Option<DevTermCommand>> {
+    let command: Arc<Mutex<Option<DevTermCommand>>> = Arc::new(Mutex::new(None));
+    let mut listener = KeyboardListener::new()?;
+    InteractiveCommand::iter().for_each(|cmd| {
+        cmd.events().iter().for_each(|&event| {
+            let cmd = cmd.clone();
+            let local_command = command.clone();
+            let f = move || {
+                let mut c = local_command.lock().unwrap();
+                *c = cmd.run();
+                debug!("{}", cmd.name());
+                Some(Cmd::AcceptLine)
+            };
+            listener.add_listener(event, f);
+        });
+    });
+    listener.add_listener(ENTER_EVENT, || {
+        println!();
+        Some(Cmd::Replace(Movement::WholeBuffer, Some("".into())))
+    });
+    listener.listen().await?;
+    let mutex = command.lock().unwrap();
+    let command = mutex.deref();
+    Ok(command.clone())
+}
+
+fn display_help() {
+    let mut vector = Vec::new();
+    vector.extend(InteractiveCommand::iter().map(|cmd| {
+        let mut shortcuts = Vec::new();
+        shortcuts.extend(cmd.events().iter().map(|&e| keyevent_to_string(e)));
+        format!(
+            "    {:8}  {:15}  {}",
+            cmd.name().color(Color::Green),
+            shortcuts.join(", ").color(Color::Blue),
+            cmd.about()
+        )
+    }));
+    println!(
+        "\n{} ({}  {}  {})\n{}\n",
+        "SHORTCUTS:".color(Color::Yellow),
+        "Command".color(Color::Green),
+        "Key(s)".color(Color::Blue),
+        "Description",
+        vector.join("\n")
+    )
+}
diff --git a/src/cli/dev.rs b/src/cli/dev/mod.rs
similarity index 75%
rename from src/cli/dev.rs
rename to src/cli/dev/mod.rs
index f744099..9197dae 100644
--- a/src/cli/dev.rs
+++ b/src/cli/dev/mod.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
 pub use clap::Args;
 
 use crate::cli::build::Build;
-use crate::cli::interactive::{run_interactive_command, InteractiveContext};
+use crate::cli::dev::terminal::{run_dev_terminal, DevTermContext};
 use crate::cli::start::Start;
 use crate::cli::stop::Stop;
 use crate::cli::CliCommand;
@@ -10,12 +10,19 @@ use crate::config::DEFAULT_CONFIG_FILE;
 use crate::docker_compose::Service;
 use crate::errors::Result;
 
+mod interactive;
+mod terminal;
+
 #[derive(Args)]
 pub struct Dev {
     /// The app configuration file.
     #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
     pub config: std::path::PathBuf,
 
+    /// Open the dev terminal instead of starting the interactive mode
+    #[clap(short, long, action)]
+    pub terminal: bool,
+
     /// Exposes services ports.
     #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
     pub expose: Vec<Service>,
@@ -42,10 +49,13 @@ impl CliCommand for Dev {
         log::debug!("Run start");
         start.run().await?;
 
-        run_interactive_command(&InteractiveContext {
-            config: self.config.clone(),
-            expose: self.expose.clone(),
-        })
+        run_dev_terminal(
+            &DevTermContext {
+                config: self.config.clone(),
+                expose: self.expose.clone(),
+            },
+            self.terminal,
+        )
         .await?;
 
         let stop = Stop;
diff --git a/src/cli/dev/terminal.rs b/src/cli/dev/terminal.rs
new file mode 100644
index 0000000..a4040fc
--- /dev/null
+++ b/src/cli/dev/terminal.rs
@@ -0,0 +1,263 @@
+use std::fs;
+
+use crate::cli::dev::interactive::listen_interactive_command;
+use chrono::{DateTime, SecondsFormat, Utc};
+pub use clap::{Args, Parser, Subcommand};
+use clap::{CommandFactory, FromArgMatches};
+use dirs::config_dir;
+use log::{debug, warn};
+use rustyline::{error::ReadlineError, Editor};
+use tokio::select;
+
+use crate::{
+    config::load_config_file,
+    devtool::stop_app_env,
+    docker_compose::{compose_build, compose_up, Service},
+    errors::{Error, Result},
+};
+
+use crate::cli::{check::Check, logs::Logs, CliCommand};
+
+use super::interactive::{InteractiveCommand, KeyboardShorcut};
+
+const LENRA_COMMAND: &str = "lenra";
+const READLINE_PROMPT: &str = "[lenra]$ ";
+// const ESCAPE_EVENT: KeyEvent = KeyEvent(KeyCode::Esc, Modifiers::NONE);
+
+pub async fn run_dev_terminal(initial_context: &DevTermContext, terminal: bool) -> Result<()> {
+    let history_path = config_dir()
+        .ok_or(Error::Custom("Can't get the user config directory".into()))?
+        .join("lenra")
+        .join("dev.history");
+    let mut rl = Editor::<()>::new()?;
+
+    debug!("Load history from {:?}", history_path);
+    if rl.load_history(&history_path).is_err() {
+        debug!("No previous history.");
+    }
+
+    let mut previous_log = Logs {
+        services: vec![Service::App],
+        follow: true,
+        ..Default::default()
+    };
+    let mut last_logs = Utc::now();
+    let mut interactive_cmd = if !terminal {
+        InteractiveCommand::Help.run();
+        Some(DevTermCommand::Logs(previous_log.clone()))
+    } else {
+        None
+    };
+    let mut context = initial_context.clone();
+
+    loop {
+        let command = if let Some(cmd) = interactive_cmd {
+            interactive_cmd = match cmd {
+                DevTermCommand::Reload => Some(DevTermCommand::Continue),
+                _ => None,
+            };
+            cmd
+        } else {
+            let readline = rl.readline(READLINE_PROMPT);
+            match readline {
+                Ok(line) => {
+                    if line.trim().is_empty() {
+                        continue;
+                    }
+
+                    rl.add_history_entry(line.as_str());
+
+                    let parse_result = parse_command_line(line.clone()).map_err(Error::from);
+                    match parse_result {
+                        Ok(dev_cli) => dev_cli.command,
+                        Err(Error::ParseCommand(clap_error)) => {
+                            clap_error.print().ok();
+                            continue;
+                        }
+                        Err(err) => {
+                            debug!("Parse command error: {}", err);
+                            warn!("not a valid command {}", line);
+                            continue;
+                        }
+                    }
+                }
+                Err(ReadlineError::Interrupted) => {
+                    debug!("CTRL-C");
+                    break;
+                }
+                Err(ReadlineError::Eof) => {
+                    debug!("CTRL-D");
+                    break;
+                }
+                Err(err) => {
+                    println!("Error: {:?}", err);
+                    break;
+                }
+            }
+        };
+
+        debug!("Run command {:#?}", command);
+        match command {
+            DevTermCommand::Continue => {
+                (last_logs, interactive_cmd) = run_logs(&previous_log, Some(last_logs)).await?;
+            }
+            DevTermCommand::Logs(logs) => match logs {
+                Logs { follow: true, .. } => {
+                    previous_log = logs.clone();
+                    (last_logs, interactive_cmd) = run_logs(&previous_log, None).await?;
+                }
+                _ => {
+                    logs.run().await?;
+                }
+            },
+            DevTermCommand::Stop | DevTermCommand::Exit => break,
+            cmd => {
+                let ctx = context.clone();
+                match cmd.run(&ctx).await {
+                    Ok(ctx_opt) => {
+                        if let Some(ctx) = ctx_opt {
+                            context = ctx.clone();
+                        }
+                    }
+                    Err(error) => eprintln!("{}", error),
+                }
+            }
+        }
+    }
+    debug!("Save history to {:?}", history_path);
+    fs::create_dir_all(history_path.parent().unwrap())?;
+    rl.save_history(&history_path).map_err(Error::from)
+}
+
+async fn run_logs(
+    logs: &Logs,
+    last_end: Option<DateTime<Utc>>,
+) -> Result<(DateTime<Utc>, Option<DevTermCommand>)> {
+    let mut clone = logs.clone();
+    if let Some(last_logs) = last_end {
+        // Only displays new logs
+        clone.since = Some(last_logs.to_rfc3339_opts(SecondsFormat::Secs, true));
+    }
+
+    let command = select! {
+        res = listen_interactive_command() => {res?}
+        res = clone.run() => {res?; None}
+        // res = tokio::signal::ctrl_c() => {res?; None}
+    };
+    Ok((Utc::now(), command))
+}
+
+fn parse_command_line(line: String) -> Result<DevCli, clap::Error> {
+    let args = &mut line.split_whitespace().collect::<Vec<&str>>();
+
+    let first_arg = if args.len() > 0 { Some(args[0]) } else { None };
+    if let Some(arg) = first_arg {
+        if LENRA_COMMAND != arg {
+            args.push(LENRA_COMMAND);
+            args.rotate_right(1);
+        }
+    }
+    debug!("Try to parse dev terminal command: {:?}", args);
+
+    let command = <DevCli as CommandFactory>::command();
+    let mut matches = command
+        .clone()
+        .try_get_matches_from(args.clone())
+        .map_err(format_error)?;
+    <DevCli as FromArgMatches>::from_arg_matches_mut(&mut matches).map_err(format_error)
+}
+
+fn format_error(err: clap::Error) -> clap::Error {
+    let mut command = <DevCli as CommandFactory>::command();
+    err.format(&mut command)
+}
+
+#[derive(Clone, Debug)]
+pub struct DevTermContext {
+    /// The app configuration file.
+    pub config: std::path::PathBuf,
+
+    /// Exposes all services ports.
+    pub expose: Vec<Service>,
+}
+
+/// The Lenra interactive command line interface
+#[derive(Parser, Debug, Clone)]
+#[clap(rename_all = "kebab-case")]
+pub struct DevCli {
+    #[clap(subcommand)]
+    pub command: DevTermCommand,
+}
+
+/// The interactive commands
+#[derive(Subcommand, Clone, Debug)]
+pub enum DevTermCommand {
+    /// Continue the previous logs command since the last displayed logs
+    Continue,
+    /// View output from the containers
+    Logs(Logs),
+    /// Reload the app by rebuilding and restarting it
+    Reload,
+    /// Stop your app and the local Lenra environment
+    Stop,
+    /// 'stop' alias
+    Exit,
+    /// Checks the running app
+    Check(Check),
+    /// Exposes the app ports
+    Expose(Expose),
+}
+
+#[derive(Args, Clone, Debug)]
+pub struct Expose {
+    /// The service list to expose
+    #[clap(value_enum, default_values = &["app", "postgres", "mongo"])]
+    pub services: Vec<Service>,
+}
+
+impl DevTermCommand {
+    async fn run(&self, context: &DevTermContext) -> Result<Option<DevTermContext>> {
+        let conf = load_config_file(&context.config).unwrap();
+        match self {
+            DevTermCommand::Continue => warn!("The continue command should not be run"),
+            DevTermCommand::Logs(_logs) => warn!("The logs command should not be run"),
+            DevTermCommand::Stop | DevTermCommand::Exit => {
+                warn!("The stop command should not be run")
+            }
+            DevTermCommand::Reload => {
+                log::debug!("Generates files");
+                conf.generate_files(context.expose.clone()).await?;
+
+                log::debug!("Docker compose build");
+                compose_build().await?;
+
+                log::debug!("Starts the containers");
+                compose_up().await?;
+
+                log::debug!("Stop the devtool app env to reset cache");
+                println!("Clearing cache");
+                let result = stop_app_env().await;
+                if let Err(error) = result {
+                    log::error!("{:?}", error);
+                }
+            }
+            DevTermCommand::Check(check) => {
+                if context.expose.contains(&Service::App) {
+                    check.run().await?
+                } else {
+                    println!("The check commands can't run if the ports are not exposed. Run the expose command first");
+                }
+            }
+            DevTermCommand::Expose(expose) => {
+                conf.generate_files(expose.services.clone()).await?;
+
+                compose_up().await?;
+
+                let mut ctx = context.clone();
+                ctx.expose = expose.services.clone();
+                return Ok(Some(ctx));
+            }
+        };
+        Ok(None)
+    }
+}
diff --git a/src/cli/interactive.rs b/src/cli/interactive.rs
deleted file mode 100644
index 1a7ed2d..0000000
--- a/src/cli/interactive.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use std::fs;
-
-use chrono::{DateTime, SecondsFormat, Utc};
-pub use clap::{Args, Parser, Subcommand};
-use clap::{CommandFactory, FromArgMatches};
-use dirs::config_dir;
-use log::{debug, warn};
-use rustyline::{error::ReadlineError, Editor};
-use tokio::select;
-
-use crate::{
-    config::load_config_file,
-    devtool::stop_app_env,
-    docker_compose::{compose_build, compose_up, Service},
-    errors::{Error, Result},
-};
-
-use super::{check::Check, logs::Logs, CliCommand};
-
-const LENRA_COMMAND: &str = "lenra";
-const READLINE_PROMPT: &str = "[lenra]$ ";
-
-pub async fn run_interactive_command(initial_context: &InteractiveContext) -> Result<()> {
-    // ctrlc::set_handler(move || {
-    //     debug!("Stop asked");
-    // })
-    // .expect("Error setting Ctrl-C handler");
-
-    let history_path = config_dir()
-        .ok_or(Error::Custom("Can't get the user config directory".into()))?
-        .join("lenra")
-        .join("dev.history");
-    let mut rl = Editor::<()>::new()?;
-
-    debug!("Load history from {:?}", history_path);
-    if rl.load_history(&history_path).is_err() {
-        debug!("No previous history.");
-    }
-
-    let mut previous_log = Logs {
-        services: vec![Service::App],
-        follow: true,
-        ..Default::default()
-    };
-    let mut last_logs = run_logs(&previous_log, None).await?;
-    let mut context = initial_context.clone();
-
-    loop {
-        let readline = rl.readline(READLINE_PROMPT);
-        match readline {
-            Ok(line) => {
-                if line.trim().is_empty() {
-                    continue;
-                }
-
-                rl.add_history_entry(line.as_str());
-
-                let command = parse_command_line(line.clone()).map_err(Error::from);
-                match command {
-                    Ok(interactive) => {
-                        debug!("Run command {:#?}", interactive.command);
-                        match interactive.command {
-                            InteractiveCommand::Continue => {
-                                last_logs = run_logs(&previous_log, Some(last_logs)).await?;
-                            }
-                            InteractiveCommand::Logs(logs) => {
-                                previous_log = logs.clone();
-                                last_logs = run_logs(&previous_log, None).await?;
-                            }
-                            InteractiveCommand::Stop | InteractiveCommand::Exit => break,
-                            cmd => {
-                                let ctx = context.clone();
-                                match cmd.run(&ctx).await {
-                                    Ok(ctx_opt) => {
-                                        if let Some(ctx) = ctx_opt {
-                                            context = ctx.clone();
-                                        }
-                                    }
-                                    Err(error) => eprintln!("{}", error),
-                                }
-                            }
-                        }
-                    }
-                    Err(Error::ParseCommand(clap_error)) => {
-                        clap_error.print().ok();
-                    }
-                    Err(err) => {
-                        debug!("Parse command error: {}", err);
-                        warn!("not a valid command {}", line);
-                    }
-                }
-            }
-            Err(ReadlineError::Interrupted) => {
-                debug!("CTRL-C");
-                break;
-            }
-            Err(ReadlineError::Eof) => {
-                debug!("CTRL-D");
-                break;
-            }
-            Err(err) => {
-                println!("Error: {:?}", err);
-                break;
-            }
-        }
-    }
-    debug!("Save history to {:?}", history_path);
-    fs::create_dir_all(history_path.parent().unwrap())?;
-    rl.save_history(&history_path).map_err(Error::from)
-}
-
-async fn run_logs(logs: &Logs, last_end: Option<DateTime<Utc>>) -> Result<DateTime<Utc>> {
-    let mut clone = logs.clone();
-    if let Some(last_logs) = last_end {
-        // Only displays new logs
-        clone.since = Some(last_logs.to_rfc3339_opts(SecondsFormat::Secs, true));
-        // Follows the logs
-        clone.follow = true;
-    }
-    select! {
-        res = clone.run() => {res?}
-        _ = tokio::signal::ctrl_c() => {}
-    }
-    Ok(Utc::now())
-}
-
-fn parse_command_line(line: String) -> Result<Interactive, clap::Error> {
-    let args = &mut line.split_whitespace().collect::<Vec<&str>>();
-
-    let first_arg = if args.len() > 0 { Some(args[0]) } else { None };
-    if let Some(arg) = first_arg {
-        if LENRA_COMMAND != arg {
-            args.push(LENRA_COMMAND);
-            args.rotate_right(1);
-        }
-    }
-    debug!("Try to parse interactive command: {:?}", args);
-
-    let command = <Interactive as CommandFactory>::command();
-    let mut matches = command
-        .clone()
-        .try_get_matches_from(args.clone())
-        .map_err(format_error)?;
-    <Interactive as FromArgMatches>::from_arg_matches_mut(&mut matches).map_err(format_error)
-}
-
-fn format_error(err: clap::Error) -> clap::Error {
-    let mut command = <Interactive as CommandFactory>::command();
-    err.format(&mut command)
-}
-
-#[derive(Clone, Debug)]
-pub struct InteractiveContext {
-    /// The app configuration file.
-    pub config: std::path::PathBuf,
-
-    /// Exposes all services ports.
-    pub expose: Vec<Service>,
-}
-
-/// The Lenra interactive command line interface
-#[derive(Parser, Debug)]
-#[clap(rename_all = "kebab-case")]
-pub struct Interactive {
-    #[clap(subcommand)]
-    pub command: InteractiveCommand,
-}
-
-/// The interactive commands
-#[derive(Subcommand, Clone, Debug)]
-pub enum InteractiveCommand {
-    /// Continue the previous logs command since the last displayed logs
-    Continue,
-    /// View output from the containers
-    Logs(Logs),
-    /// Reload the app by rebuilding and restarting it
-    Reload,
-    /// Stop your app previously started with the start command
-    Stop,
-    /// stop alias. Stop your app previously started with the start command
-    Exit,
-    /// Checks the running app
-    Check(Check),
-    /// Exposes the app ports
-    Expose(Expose),
-}
-
-#[derive(Args, Clone, Debug)]
-pub struct Expose {
-    /// The service list to expose
-    #[clap(value_enum, default_values = &["app", "postgres", "mongo"])]
-    pub services: Vec<Service>,
-}
-
-impl InteractiveCommand {
-    async fn run(&self, context: &InteractiveContext) -> Result<Option<InteractiveContext>> {
-        let conf = load_config_file(&context.config).unwrap();
-        match self {
-            InteractiveCommand::Continue => warn!("The continue command should not be run"),
-            InteractiveCommand::Logs(_logs) => warn!("The logs command should not be run"),
-            InteractiveCommand::Stop | InteractiveCommand::Exit => {
-                warn!("The stop command should not be run")
-            }
-            InteractiveCommand::Reload => {
-                log::debug!("Generates files");
-                conf.generate_files(context.expose.clone()).await?;
-
-                log::debug!("Docker compose build");
-                compose_build().await?;
-
-                log::debug!("Starts the containers");
-                compose_up().await?;
-
-                log::debug!("Stop the devtool app env to reset cache");
-                let result = stop_app_env().await;
-                if let Err(error) = result {
-                    log::info!("{:?}", error);
-                }
-            }
-            InteractiveCommand::Check(check) => {
-                if context.expose.contains(&Service::App) {
-                    check.run().await?
-                } else {
-                    println!("The check commands can't run if the ports are not exposed. Run the expose command first");
-                }
-            }
-            InteractiveCommand::Expose(expose) => {
-                conf.generate_files(expose.services.clone()).await?;
-
-                compose_up().await?;
-
-                let mut ctx = context.clone();
-                ctx.expose = expose.services.clone();
-                return Ok(Some(ctx));
-            }
-        };
-        Ok(None)
-    }
-}
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index bd4aab4..31b518b 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -81,7 +81,6 @@ impl CliCommand for Logs {
 
         log::debug!("cmd: {:?}", command);
         let output = command.spawn()?.wait_with_output().await?;
-
         if !output.status.success() {
             warn!(
                 "An error occured while displaying the docker-compose logs:\n{}\n{}",
@@ -89,6 +88,7 @@ impl CliCommand for Logs {
                 String::from_utf8(output.stderr).unwrap()
             )
         }
+
         Ok(())
     }
 }
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 6dbbcfd..d50bb46 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -12,7 +12,6 @@ mod build;
 mod check;
 mod dev;
 mod init;
-mod interactive;
 mod logs;
 mod new;
 mod start;
diff --git a/src/cli/new.rs b/src/cli/new.rs
index f2296b5..b3bc07a 100644
--- a/src/cli/new.rs
+++ b/src/cli/new.rs
@@ -56,6 +56,7 @@ impl CliCommand for New {
             self.path.display()
         );
         Command::new("git")
+            .kill_on_drop(true)
             .arg("clone")
             .arg("--single-branch")
             .arg("--depth")
@@ -72,6 +73,7 @@ impl CliCommand for New {
 
         log::debug!("init git project");
         Command::new("git")
+            .kill_on_drop(true)
             .current_dir(self.path.as_os_str())
             .arg("init")
             .spawn()?
@@ -79,6 +81,7 @@ impl CliCommand for New {
             .await
             .map_err(Error::from)?;
         Command::new("git")
+            .kill_on_drop(true)
             .current_dir(self.path.as_os_str())
             .arg("add")
             .arg(".")
@@ -87,6 +90,7 @@ impl CliCommand for New {
             .await
             .map_err(Error::from)?;
         Command::new("git")
+            .kill_on_drop(true)
             .current_dir(self.path.as_os_str())
             .arg("commit")
             .arg("-m")
diff --git a/src/config.rs b/src/config.rs
index 54363c2..482ecd1 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -214,7 +214,7 @@ impl Application {
             ));
         }
 
-        envs.insert("exec_timeout".to_string(), "0".to_string());
+        // envs.insert("exec_timeout".to_string(), "0".to_string());
 
         if let Some(cmd) = image.cmd {
             envs.insert("fprocess".to_string(), cmd.join(" "));
@@ -286,7 +286,7 @@ mod dofigen_of_overlay_tests {
             image: String::from("my-dockerimage"),
             envs: Some(
                 [
-                    ("exec_timeout".to_string(), "0".to_string()),
+                    // ("exec_timeout".to_string(), "0".to_string()),
                     ("fprocess".to_string(), "/app/my-app".to_string()),
                 ]
                 .into(),
diff --git a/src/devtool.rs b/src/devtool.rs
index 9792209..a8041e0 100644
--- a/src/devtool.rs
+++ b/src/devtool.rs
@@ -1,9 +1,12 @@
+use log::debug;
+
 use crate::{
     docker_compose::{execute_compose_service_command, DEVTOOL_SERVICE_NAME},
     errors::Result,
 };
 
 pub async fn stop_app_env() -> Result<()> {
+    debug!("Stop app environment");
     execute_compose_service_command(
         DEVTOOL_SERVICE_NAME,
         &[
@@ -13,5 +16,6 @@ pub async fn stop_app_env() -> Result<()> {
         ],
     )
     .await?;
+    debug!("App environment stopped");
     Ok(())
 }
diff --git a/src/docker.rs b/src/docker.rs
index 0aeb8fd..7797a3d 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -2,6 +2,6 @@ use tokio::process::Command;
 
 pub fn pull(image: String) -> Command {
     let mut cmd = Command::new("docker");
-    cmd.arg("pull").arg(image);
+    cmd.kill_on_drop(true).arg("pull").arg(image);
     cmd
 }
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 3ba5911..cc55539 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -2,7 +2,8 @@ use docker_compose_types::{
     AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions, Deploy,
     EnvTypes, Environment, Healthcheck, HealthcheckTest, Limits, Resources, Services,
 };
-use log::warn;
+use lazy_static::lazy_static;
+use log::{debug, warn};
 use std::process::Stdio;
 use std::{convert::TryInto, env, fs, path::PathBuf};
 use tokio::process;
@@ -36,6 +37,10 @@ pub const NON_ROOT_USER: &str = "12000";
 const MEMORY_RESERVATION: &str = "128M";
 const MEMORY_LIMIT: &str = "256M";
 
+lazy_static! {
+    static ref COMPOSE_COMMAND: std::process::Command = get_compose_command();
+}
+
 /// Generates the docker-compose.yml file
 pub async fn generate_docker_compose(
     dockerfile: PathBuf,
@@ -232,9 +237,8 @@ async fn generate_docker_compose_content(
 
 pub fn create_compose_command() -> process::Command {
     let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
-    let mut cmd = process::Command::new("docker");
-
-    cmd.arg("compose").arg("-f").arg(dockercompose_path);
+    let mut cmd = process::Command::from(COMPOSE_COMMAND.clone());
+    cmd.arg("-f").arg(dockercompose_path).kill_on_drop(true);
 
     cmd
 }
@@ -392,3 +396,40 @@ impl ServiceImages {
         }
     }
 }
+
+fn get_compose_command() -> std::process::Command {
+    match std::process::Command::new("docker-compose")
+        .arg("version")
+        .spawn()
+    {
+        Ok(_) => {
+            debug!("Using 'docker-compose'");
+            std::process::Command::new("docker-compose")
+        }
+        Err(e) => {
+            if std::io::ErrorKind::NotFound != e.kind() {
+                warn!(
+                    "An unexpected error occured while runing 'docker-compose version' {}",
+                    e
+                );
+            }
+            debug!("Using 'docker compose'");
+            let mut cmd = std::process::Command::new("docker");
+            cmd.arg("compose");
+            cmd
+        }
+    }
+    .into()
+}
+
+trait CloneCommand {
+    fn clone(&self) -> Self;
+}
+
+impl CloneCommand for std::process::Command {
+    fn clone(&self) -> Self {
+        let mut new = Self::new(self.get_program());
+        new.args(self.get_args());
+        new
+    }
+}
diff --git a/src/git.rs b/src/git.rs
index 8eab068..ae72ec8 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -5,6 +5,7 @@ use crate::errors::{CommandError, Error, Result};
 pub async fn get_current_branch() -> Result<String> {
     let mut command = Command::new("git");
     let output = command
+        .kill_on_drop(true)
         .arg("rev-parse")
         .arg("--abbrev-ref")
         .arg("HEAD")
diff --git a/src/keyboard_event.rs b/src/keyboard_event.rs
new file mode 100644
index 0000000..70000ea
--- /dev/null
+++ b/src/keyboard_event.rs
@@ -0,0 +1,127 @@
+use log::{debug, warn};
+use rustyline::{
+    Cmd, ConditionalEventHandler, Editor, Event, EventContext, EventHandler, Helper, KeyCode,
+    KeyEvent, Modifiers, RepeatCount,
+};
+
+use crate::errors::{Error, Result};
+
+#[derive(Debug)]
+struct KeyEventHandler<F>
+where
+    F: Fn() -> Option<Cmd> + Send + Sync + 'static,
+{
+    event: KeyEvent,
+    listener: F,
+}
+
+pub trait KeyEventListener<F>
+where
+    F: Fn() -> Option<Cmd> + Send + Sync + 'static,
+{
+    fn add_listener(&mut self, event: KeyEvent, listener: F) -> &mut Self;
+}
+
+impl<F, H> KeyEventListener<F> for Editor<H>
+where
+    F: Fn() -> Option<Cmd> + Send + Sync + 'static,
+    H: Helper,
+{
+    fn add_listener(&mut self, event: KeyEvent, listener: F) -> &mut Self {
+        let normalized_event = KeyEvent::normalize(event);
+        self.bind_sequence(
+            normalized_event.clone(),
+            EventHandler::Conditional(Box::new(KeyEventHandler {
+                event: normalized_event,
+                listener: listener,
+            })),
+        );
+        self
+    }
+}
+
+impl<F> ConditionalEventHandler for KeyEventHandler<F>
+where
+    F: Fn() -> Option<Cmd> + Send + Sync,
+{
+    fn handle(&self, evt: &Event, _: RepeatCount, _: bool, _: &EventContext) -> Option<Cmd> {
+        debug!("KeyEventHandler: {:?}", evt);
+        if let Some(k) = evt.get(0) {
+            let key = KeyEvent::normalize(*k);
+            debug!("KeyEventHandler: {:?}", key);
+            if key == self.event {
+                return (self.listener)();
+            }
+        } else {
+            warn!("KeyEventHandler without key");
+        }
+        Some(Cmd::Insert(0, "".into()))
+    }
+}
+
+pub struct KeyboardListener {
+    editor: Editor<()>,
+}
+
+impl<F> KeyEventListener<F> for KeyboardListener
+where
+    F: Fn() -> Option<Cmd> + Send + Sync + 'static,
+{
+    fn add_listener(&mut self, event: KeyEvent, listener: F) -> &mut Self {
+        self.editor.add_listener(event, listener);
+        self
+    }
+}
+
+impl KeyboardListener {
+    pub async fn listen(mut self) -> Result<()> {
+        tokio::task::spawn_blocking(move || self.editor.readline("").map_err(Error::from))
+            .await
+            .map_err(Error::from)?
+            .ok();
+        Ok(())
+    }
+
+    pub fn new() -> Result<Self> {
+        Ok(KeyboardListener {
+            editor: Editor::new()?,
+        })
+    }
+}
+
+pub fn keyevent_to_string(event: KeyEvent) -> String {
+    let mut parts = Vec::new();
+    if event.1 & Modifiers::CTRL == Modifiers::CTRL {
+        parts.push("Ctrl".to_string());
+    }
+    if event.1 & Modifiers::ALT == Modifiers::ALT {
+        parts.push("Alt".to_string());
+    }
+    if event.1 & Modifiers::SHIFT == Modifiers::SHIFT {
+        parts.push("Shift".to_string());
+    }
+    parts.push(keycode_to_string(event.0));
+    parts.join("+")
+}
+
+fn keycode_to_string(keycode: KeyCode) -> String {
+    match keycode {
+        KeyCode::Backspace => "⌫".to_string(),
+        KeyCode::Char(c) => c.to_string().to_uppercase(),
+        KeyCode::Delete => "Del".to_string(),
+        KeyCode::Down => "Down".to_string(),
+        KeyCode::End => "End".to_string(),
+        KeyCode::Enter => "Enter".to_string(),
+        KeyCode::Esc => "Esc".to_string(),
+        KeyCode::F(num) => format!("F{}", num),
+        KeyCode::Home => "Home".to_string(),
+        KeyCode::Insert => "Insert".to_string(),
+        KeyCode::Left => "Left".to_string(),
+        KeyCode::PageDown => "Page Down".to_string(),
+        KeyCode::PageUp => "Page Up".to_string(),
+        KeyCode::Right => "Right".to_string(),
+        KeyCode::Tab => "Tab".to_string(),
+        KeyCode::Up => "Up".to_string(),
+        _ => todo!(),
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 1da6f28..f9b6bd8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,6 +14,7 @@ mod docker;
 mod docker_compose;
 mod errors;
 mod git;
+mod keyboard_event;
 mod matching;
 
 #[tokio::main]

From 8c8883cc6731fff7b8f733f17a0833a532c36277 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 24 Feb 2023 14:37:24 +0100
Subject: [PATCH 44/76] feat: suppress_lock for http mode (#189)

---
 src/config.rs | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 482ecd1..bf6f981 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2,6 +2,7 @@ use std::{collections::HashMap, fs, path::PathBuf};
 
 use dofigen_lib::{
     self, from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder,
+    Healthcheck,
 };
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
@@ -171,6 +172,7 @@ impl Application {
         } else {
             Vec::new()
         };
+        // add of-watchdog builder
         builders.push(Builder {
             name: Some(String::from(OF_WATCHDOG_BUILDER)),
             image: format!("{}:{}", OF_WATCHDOG_IMAGE, OF_WATCHDOG_VERSION),
@@ -182,6 +184,7 @@ impl Application {
         } else {
             Vec::new()
         };
+        // get of-watchdog artifact
         artifacts.push(Artifact {
             builder: OF_WATCHDOG_BUILDER.to_string(),
             source: "/fwatchdog".to_string(),
@@ -194,20 +197,34 @@ impl Application {
             HashMap::new()
         };
 
+        let mut healthcheck = None;
+        // http mode (not if empty)
         if let Some(ports) = image.ports {
+            if ports.len() > 1 {
+                return Err(Error::Custom(
+                    "More than one port has been defined in the Dofigen descriptor".into(),
+                ));
+            }
             if ports.len() == 1 {
                 envs.insert("mode".to_string(), "http".to_string());
                 envs.insert(
                     "upstream_url".to_string(),
                     format!("http://127.0.0.1:{}", ports[0]),
                 );
-            } else if ports.len() > 1 {
-                return Err(Error::Custom(
-                    "More than one port has been defined in the Dofigen descriptor".into(),
-                ));
+                envs.insert("suppress_lock".to_string(), "true".to_string());
+
+                // handle healthcheck
+                healthcheck = Some(Healthcheck {
+                    cmd: "curl --fail http://localhost:8080/_/health".into(),
+                    start: Some("3s".into()),
+                    interval: Some("3s".into()),
+                    timeout: Some("1s".into()),
+                    retries: Some(10),
+                });
             }
         };
 
+        // prevent custom entrypoint
         if image.entrypoint.is_some() {
             return Err(Error::Custom(
                 "The Dofigen descriptor can't have entrypoint defined. Use cmd instead".into(),
@@ -238,7 +255,7 @@ impl Application {
             root: image.root,
             script: image.script,
             caches: image.caches,
-            healthcheck: image.healthcheck,
+            healthcheck: healthcheck,
             ignores: image.ignores,
         })
     }

From 3ab596445734c00828021768602d552190123616 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Thu, 9 Mar 2023 18:21:49 +0100
Subject: [PATCH 45/76] fix: Normalize image tag (#201)

---
 .github/workflows/build_ci.yml |   2 +-
 Cargo.lock                     |  21 +++++++
 Cargo.toml                     |   3 +
 README.md                      |  24 ++++++--
 src/docker.rs                  |  58 +++++++++++++++++++
 src/docker_compose.rs          | 103 +++++++++++++++++++++++++++++++--
 src/git.rs                     |   5 +-
 src/main.rs                    |   1 +
 8 files changed, 207 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
index 39cd1bf..e8d0b83 100644
--- a/.github/workflows/build_ci.yml
+++ b/.github/workflows/build_ci.yml
@@ -74,7 +74,7 @@ jobs:
     - name: Install rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: nightly
         profile: minimal
         override: true
 
diff --git a/Cargo.lock b/Cargo.lock
index 680bdfa..64e78d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -607,6 +607,7 @@ dependencies = [
  "env_logger",
  "lazy_static",
  "log",
+ "mocktopus",
  "open",
  "regex",
  "rustyline",
@@ -686,6 +687,26 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "mocktopus"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4f0d5a1621fea252541cf67533c4b9c32ee892d790768f4ad48f1063059537"
+dependencies = [
+ "mocktopus_macros",
+]
+
+[[package]]
+name = "mocktopus_macros"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "nibble_vec"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index c5269db..1ba6716 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,3 +40,6 @@ ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.24.1", features = ["full"] }
 async-trait = "0.1.61"
 strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
+
+[dev-dependencies]
+mocktopus = "0.8.0"
diff --git a/README.md b/README.md
index d06eb38..8496e42 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,12 @@ Then use the next command to install the Lenra's cli:
 cargo install lenra_cli
 ```
 
+Since the CLI is not released yet, you have to target a [pre-release version](https://github.com/lenra-io/lenra_cli/releases) like that:
+
+```bash
+cargo install lenra_cli@v1.0.0-beta.24
+```
+
 #### Build it from sources
 
 First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
@@ -137,10 +143,10 @@ generator:
 
 The configuration is the main element of the file:
 
-| Field            | Type             | Description                   |
-|------------------|------------------|-------------------------------|
-| `componentsApi`  | String           | The components API version    |
-| `generator`      | [Generator](#generator)  The generator configuration |
+| Field           | Type                    | Description                 |
+| --------------- | ----------------------- | --------------------------- |
+| `componentsApi` | String                  | The components API version  |
+| `generator`     | [Generator](#generator) | The generator configuration |
 
 ### Generator
 
@@ -171,6 +177,16 @@ Contributions are what make the open source community such an amazing place to l
 If you have a suggestion that would make this better, please open an issue with the tag "enhancement" or "bug".
 Don't forget to give the project a star! Thanks again!
 
+### Run tests
+
+In order to have more advanced unit tests, we use [Mocktopus](https://github.com/CodeSandwich/Mocktopus) that is based on the nightly Rust toolchain.
+To run them you have to install the toolchain and run them with it:
+
+```bash
+rustup install nightly
+cargo +nightly test
+```
+
 <p align="right">(<a href="#top">back to top</a>)</p>
 
 
diff --git a/src/docker.rs b/src/docker.rs
index 7797a3d..0d98181 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -1,3 +1,9 @@
+use std::{
+    collections::hash_map::DefaultHasher,
+    hash::{Hash, Hasher},
+};
+
+use regex::Regex;
 use tokio::process::Command;
 
 pub fn pull(image: String) -> Command {
@@ -5,3 +11,55 @@ pub fn pull(image: String) -> Command {
     cmd.kill_on_drop(true).arg("pull").arg(image);
     cmd
 }
+
+pub fn normalize_tag(tag: String) -> String {
+    let re = Regex::new(r"[^A-Za-z0-9._-]").unwrap();
+    let tag = re.replace_all(tag.as_str(), "-").to_string();
+    if tag.len() > 63 {
+        let mut hacher = DefaultHasher::new();
+        tag.hash(&mut hacher);
+        let hash = format!("{:X}", hacher.finish());
+        format!(
+            "{}{}",
+            tag.chars().take(63 - hash.len()).collect::<String>(),
+            hash
+        )
+    } else {
+        tag
+    }
+}
+
+#[cfg(test)]
+mod test_normalize_tag {
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
+
+    use regex::Regex;
+
+    use super::normalize_tag;
+
+    #[test]
+    fn prefixed_tag_name() {
+        let tag_name = "prefixed/branch-name".to_string();
+        assert_eq!(normalize_tag(tag_name), "prefixed-branch-name".to_string());
+    }
+
+    #[test]
+    fn long_tag_name() {
+        let tag_name =
+            "prefixed/branch-name/with_many-many.many_many&many-many/underscore".to_string();
+        let re = Regex::new(r"[^A-Za-z0-9._-]").unwrap();
+        let tag = re.replace_all(tag_name.as_str(), "-").to_string();
+        let mut hacher = DefaultHasher::new();
+        tag.hash(&mut hacher);
+        let hash = format!("{:X}", hacher.finish());
+        let tag = format!(
+            "{}{}",
+            tag.chars().take(63 - hash.len()).collect::<String>(),
+            hash
+        );
+        assert_eq!(normalize_tag(tag_name), tag.to_string());
+    }
+}
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index cc55539..16f531b 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -9,6 +9,7 @@ use std::{convert::TryInto, env, fs, path::PathBuf};
 use tokio::process;
 
 use crate::config::Image;
+use crate::docker::normalize_tag;
 use crate::errors::Error;
 use crate::{
     config::{Dev, DOCKERCOMPOSE_DEFAULT_PATH},
@@ -323,10 +324,10 @@ pub async fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
         APP_BASE_IMAGE,
         current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string())
     );
-    let default_app_tag = get_current_branch()
-        .await
-        .ok()
-        .unwrap_or(APP_DEFAULT_IMAGE_TAG.to_string());
+    let default_app_tag = match get_current_branch().await {
+        Ok(branch_name) => normalize_tag(branch_name),
+        _ => APP_DEFAULT_IMAGE_TAG.to_string(),
+    };
 
     let dev = dev_conf.clone().unwrap_or(Dev {
         ..Default::default()
@@ -433,3 +434,97 @@ impl CloneCommand for std::process::Command {
         new
     }
 }
+
+#[cfg(test)]
+mod test_get_services_images {
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
+
+    use crate::git;
+
+    use super::*;
+    use mocktopus::mocking::*;
+    use regex::Regex;
+
+    #[tokio::test]
+    async fn basic() {
+        let app_tag = "test";
+        let images: ServiceImages = get_services_images(&Some(Dev {
+            app: Some(Image {
+                image: None,
+                tag: Some(app_tag.into()),
+            }),
+            ..Default::default()
+        }))
+        .await;
+        assert_eq!(
+            images.get(&Service::App),
+            format!("lenra/app/lenra_cli:{}", app_tag)
+        );
+        assert_eq!(
+            images.get(&Service::Devtool),
+            format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG)
+        );
+        assert_eq!(
+            images.get(&Service::Postgres),
+            format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG)
+        );
+        assert_eq!(
+            images.get(&Service::Mongo),
+            format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG)
+        );
+    }
+
+    #[tokio::test]
+    async fn branch_name() {
+        git::get_current_branch
+            .mock_safe(|| MockResult::Return(Box::pin(async move { Ok("test".to_string()) })));
+        let images: ServiceImages = get_services_images(&None).await;
+        assert_eq!(
+            images.get(&Service::App),
+            "lenra/app/lenra_cli:test".to_string()
+        );
+    }
+
+    #[tokio::test]
+    async fn path_branch_name() {
+        git::get_current_branch.mock_safe(|| {
+            MockResult::Return(Box::pin(async move {
+                Ok("prefixed/branch-name_withUnderscore".to_string())
+            }))
+        });
+        let images: ServiceImages = get_services_images(&None).await;
+        assert_eq!(
+            images.get(&Service::App),
+            "lenra/app/lenra_cli:prefixed-branch-name_withUnderscore".to_string()
+        );
+    }
+
+    #[tokio::test]
+    async fn long_branch_name() {
+        let branch_name =
+            "prefixed/branch-name/with_many-many.many_many-many-many/underscore".to_string();
+        let re = Regex::new(r"[^A-Za-z0-9._-]").unwrap();
+        let tag = re.replace_all(branch_name.as_str(), "-").to_string();
+        let mut hacher = DefaultHasher::new();
+        tag.hash(&mut hacher);
+        let hash = format!("{:X}", hacher.finish());
+        let tag = format!(
+            "{}{}",
+            tag.chars().take(63 - hash.len()).collect::<String>(),
+            hash
+        );
+
+        git::get_current_branch.mock_safe(move || {
+            let branch = branch_name.clone();
+            MockResult::Return(Box::pin(async move { Ok(branch) }))
+        });
+        let images: ServiceImages = get_services_images(&None).await;
+        assert_eq!(
+            images.get(&Service::App),
+            format!("lenra/app/lenra_cli:{}", tag)
+        );
+    }
+}
diff --git a/src/git.rs b/src/git.rs
index ae72ec8..83f1bfb 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -1,7 +1,10 @@
+use crate::errors::{CommandError, Error, Result};
 use tokio::process::Command;
 
-use crate::errors::{CommandError, Error, Result};
+#[cfg(test)]
+use mocktopus::macros::mockable;
 
+#[cfg_attr(test, mockable)]
 pub async fn get_current_branch() -> Result<String> {
     let mut command = Command::new("git");
     let output = command
diff --git a/src/main.rs b/src/main.rs
index f9b6bd8..96f14ce 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,7 @@ mod git;
 mod keyboard_event;
 mod matching;
 
+// #![cfg_attr(test, feature(proc_macro_hygiene))]
 #[tokio::main]
 async fn main() -> Result<()> {
     env_logger::init();

From 18a8df4411a2a7b5df4372d0282beab89086fdbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Apr 2023 11:10:56 +0200
Subject: [PATCH 46/76] build(deps): bump async-trait from 0.1.61 to 0.1.68
 (#207)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 55 ++++++++++++++++++++++++++++++++----------------------
 Cargo.toml |  2 +-
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64e78d8..92e0a0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,13 +28,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.61"
+version = "0.1.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.10",
 ]
 
 [[package]]
@@ -132,7 +132,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -215,7 +215,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -232,7 +232,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -267,7 +267,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
 dependencies = [
  "darling_core",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -288,7 +288,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
  "derive_builder_core",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -704,7 +704,7 @@ checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -829,7 +829,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
  "version_check",
 ]
 
@@ -846,18 +846,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1024,7 +1024,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1119,7 +1119,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1133,6 +1133,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -1165,7 +1176,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1222,7 +1233,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1344,7 +1355,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
  "wasm-bindgen-shared",
 ]
 
@@ -1366,7 +1377,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 1ba6716..a08846e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.24.1", features = ["full"] }
-async-trait = "0.1.61"
+async-trait = "0.1.68"
 strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]

From baccb80bf2a18d4c1048b71fa8412dda0511dcd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Apr 2023 23:52:35 +0200
Subject: [PATCH 47/76] build(deps): bump serde_yaml from 0.9.16 to 0.9.19
 (#199)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 92e0a0f..cc925f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1040,9 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.16"
+version = "0.9.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b5b431e8907b50339b51223b97d102db8d987ced36f6e4d03621db9316c834"
+checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1271,9 +1271,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2"
+checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c"
 
 [[package]]
 name = "untrusted"
diff --git a/Cargo.toml b/Cargo.toml
index a08846e..b610934 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ path = "src/main.rs"
 clap = { version = "3.2", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_yaml = "0.9.2"
+serde_yaml = "0.9.19"
 log = "0.4.17"
 env_logger = "0.10.0"
 regex = "1.7.1"

From c180df921c0180d0410d262d0b4f431301f02069 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Sat, 1 Apr 2023 23:57:28 +0200
Subject: [PATCH 48/76] Revert "build(deps): bump async-trait from 0.1.61 to
 0.1.68" (#213)

---
 Cargo.lock | 55 ++++++++++++++++++++++--------------------------------
 Cargo.toml |  2 +-
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc925f7..65c2e72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,13 +28,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.68"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.10",
+ "syn",
 ]
 
 [[package]]
@@ -132,7 +132,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -215,7 +215,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -232,7 +232,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -267,7 +267,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
 dependencies = [
  "darling_core",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -288,7 +288,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
  "derive_builder_core",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -704,7 +704,7 @@ checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -829,7 +829,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
  "version_check",
 ]
 
@@ -846,18 +846,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.54"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -1024,7 +1024,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -1119,7 +1119,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -1133,17 +1133,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn"
-version = "2.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -1176,7 +1165,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -1233,7 +1222,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
 ]
 
 [[package]]
@@ -1355,7 +1344,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -1377,7 +1366,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index b610934..055123d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.24.1", features = ["full"] }
-async-trait = "0.1.68"
+async-trait = "0.1.61"
 strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]

From 821a12eca22708004c984f064b3627f765545837 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Apr 2023 00:08:32 +0200
Subject: [PATCH 49/76] build(deps): bump tokio from 1.24.1 to 1.27.0 (#210)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
---
 Cargo.lock | 81 +++++++++++++++++++++++++++++++++++-------------------
 Cargo.toml |  2 +-
 2 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 65c2e72..d1ef985 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,7 +424,7 @@ checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27"
 dependencies = [
  "cfg-if",
  "rustix",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -557,7 +557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -569,7 +569,7 @@ dependencies = [
  "hermit-abi 0.2.6",
  "io-lifetimes",
  "rustix",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -684,7 +684,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -770,7 +770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
 dependencies = [
  "pathdiff",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -799,7 +799,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -935,7 +935,7 @@ dependencies = [
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1068,9 +1068,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi",
@@ -1196,14 +1196,13 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.24.1"
+version = "1.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
 dependencies = [
  "autocfg",
  "bytes",
  "libc",
- "memchr",
  "mio",
  "num_cpus",
  "parking_lot",
@@ -1211,14 +1210,14 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1452,44 +1451,68 @@ dependencies = [
  "windows_x86_64_msvc",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
diff --git a/Cargo.toml b/Cargo.toml
index 055123d..b327f99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ chrono = "0.4.22"
 thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
-tokio = { version = "1.24.1", features = ["full"] }
+tokio = { version = "1.27.0", features = ["full"] }
 async-trait = "0.1.61"
 strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
 

From e46ec751cb3c561c6d1883c80bcfad2d2f099d02 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Mon, 3 Apr 2023 17:17:48 +0200
Subject: [PATCH 50/76] build(deps): Upgrade async-trat to 0.1.68

---
 Cargo.lock | 55 ++++++++++++++++++++++++++++++++----------------------
 Cargo.toml |  2 +-
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1ef985..0b0fa74 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,13 +28,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.61"
+version = "0.1.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.13",
 ]
 
 [[package]]
@@ -132,7 +132,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -215,7 +215,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -232,7 +232,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -256,7 +256,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -267,7 +267,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
 dependencies = [
  "darling_core",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -288,7 +288,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -298,7 +298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
  "derive_builder_core",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -704,7 +704,7 @@ checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -829,7 +829,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
  "version_check",
 ]
 
@@ -846,18 +846,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1024,7 +1024,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1119,7 +1119,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1133,6 +1133,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -1165,7 +1176,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
 ]
 
 [[package]]
@@ -1221,7 +1232,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.13",
 ]
 
 [[package]]
@@ -1343,7 +1354,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
  "wasm-bindgen-shared",
 ]
 
@@ -1365,7 +1376,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.107",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index b327f99..878a61b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.27.0", features = ["full"] }
-async-trait = "0.1.61"
+async-trait = "0.1.68"
 strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]

From ee40224927f9f285d91927c232ebc1ef8752a4e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 09:17:49 +0200
Subject: [PATCH 51/76] build(deps): bump chrono from 0.4.23 to 0.4.24 (#215)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b0fa74..5e6695f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,9 +92,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.23"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
 dependencies = [
  "iana-time-zone",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 878a61b..e1b2fd0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ docker-compose-types = "0.4.0"
 open = "3"
 rustyline = "10.1.0"
 dirs = "4.0.0"
-chrono = "0.4.22"
+chrono = "0.4.24"
 thiserror = "1.0.37"
 colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }

From 75d66544e92e98d40f7c067a896daf9fd5024e03 Mon Sep 17 00:00:00 2001
From: Louis G <louis.guilbert@lenra.io>
Date: Tue, 4 Apr 2023 01:18:30 -0600
Subject: [PATCH 52/76] docs: Remove Nesqwik from default assignment in bug
 template (#204)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a72d9af..6f34b48 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -3,7 +3,6 @@ description: Send a bug report
 title: "[Bug]: "
 labels: ["bug", "triage"]
 assignees:
-  - Nesqwik
   - taorepoara
 body:
   - type: markdown

From faec7854cbb6512b6f4c9c882a137df21954ed67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 09:42:25 +0200
Subject: [PATCH 53/76] build(deps): bump dirs from 4.0.0 to 5.0.0 (#217)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e6695f..7dffff7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -303,9 +303,9 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "4.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
 dependencies = [
  "dirs-sys",
 ]
@@ -322,13 +322,13 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
 dependencies = [
  "libc",
  "redox_users",
- "winapi",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e1b2fd0..143e6e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ dofigen = "1.2.0"
 docker-compose-types = "0.4.0"
 open = "3"
 rustyline = "10.1.0"
-dirs = "4.0.0"
+dirs = "5.0.0"
 chrono = "0.4.24"
 thiserror = "1.0.37"
 colored = "2.0.0"

From cca85de5da584f6365a780165d779a389030e329 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 10:33:43 +0200
Subject: [PATCH 54/76] build(deps): bump serde from 1.0.152 to 1.0.159 (#216)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
---
 Cargo.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7dffff7..31ebdee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1009,22 +1009,22 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.13",
 ]
 
 [[package]]

From 6140e9da6eb1a03ca294ba734196fefd688958e8 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:20:25 +0200
Subject: [PATCH 55/76] feat!: Upgrade command (#211)

---
 README.md             |  22 ++++----
 docs/init.md          |  16 ------
 docs/new.md           |   4 +-
 docs/upgrade.md       |  15 +++++
 src/cli/init.rs       |  22 --------
 src/cli/mod.rs        |  12 ++--
 src/cli/new.rs        |  89 +++++++-----------------------
 src/cli/upgrade.rs    | 116 +++++++++++++++++++++++++++++++++++++++
 src/command.rs        |  22 ++++++++
 src/docker_compose.rs |   8 +--
 src/git.rs            |  58 ++++++++++++++------
 src/main.rs           |   2 +
 src/template.rs       | 124 ++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 362 insertions(+), 148 deletions(-)
 delete mode 100644 docs/init.md
 create mode 100644 docs/upgrade.md
 delete mode 100644 src/cli/init.rs
 create mode 100644 src/cli/upgrade.rs
 create mode 100644 src/command.rs
 create mode 100644 src/template.rs

diff --git a/README.md b/README.md
index 8496e42..aef15fc 100644
--- a/README.md
+++ b/README.md
@@ -96,16 +96,16 @@ OPTIONS:
     -V, --version    Print version information
 
 SUBCOMMANDS:
-    build     Build your app in release mode
-    check     Checks the running app
-    dev       Start the app in an interactive mode
-    help      Print this message or the help of the given subcommand(s)
-    init      Generates dockerfile and docker compose file with the init command
-    logs      View output from the containers
-    new       Create a new Lenra app project
-    start     Start your app previously built with the build command
-    stop      Stop your app previously started with the start command
-    update    Update the tools Docker images
+    build      Build your app in release mode
+    check      Checks the running app
+    dev        Start the app in an interactive mode
+    help       Print this message or the help of the given subcommand(s)
+    logs       View output from the containers
+    new        Create a new Lenra app project
+    start      Start your app previously built with the build command
+    stop       Stop your app previously started with the start command
+    update     Update the tools Docker images
+    upgrade    Upgrade the app with the last template updates
 ```
 
 <p align="right">(<a href="#top">back to top</a>)</p>
@@ -117,12 +117,12 @@ This tool contains many subcommands to help you doing what you need.
 - [new](docs/new.md): creates a new Lenra app project
 - [dev](docs/dev.md): starts your app in dev mode
 - [update](docs/update.md): updates the tools Docker images
+- [upgrade](docs/upgrade.md): upgrades the app with the last template updates
 - [build](docs/build.md): builds the Lenra app of the current directory
 - [start](docs/start.md): starts your app previously built with the build command
 - [logs](docs/logs.md): displays output from the containers
 - [stop](docs/stop.md): stops your app previously started with the start command
 - [check](docs/check.md): checks the running app
-- [init](docs/init.md): generates Docker and Docker Compose files
 
 
 <p align="right">(<a href="#top">back to top</a>)</p>
diff --git a/docs/init.md b/docs/init.md
deleted file mode 100644
index cce408e..0000000
--- a/docs/init.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# init
-
-This subcommand generates Docker and Docker Compose files.
-
-```bash
-$ lenra init --help
-lenra-init 
-Generates dockerfile and docker compose file with the init command
-
-USAGE:
-    lenra init [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-    -h, --help               Print help information
-```
diff --git a/docs/new.md b/docs/new.md
index f27dcce..3e065ba 100644
--- a/docs/new.md
+++ b/docs/new.md
@@ -9,7 +9,7 @@ lenra-new
 Create a new Lenra app project
 
 USAGE:
-    lenra new <TEMPLATE> <PATH>
+    lenra new <TEMPLATE> [PATH]
 
 ARGS:
     <TEMPLATE>    The project template from which your project will be created. For example,
@@ -18,7 +18,7 @@ ARGS:
                   this url:
                   https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
                   You also can set the template project full url to use custom ones
-    <PATH>        The project path
+    <PATH>        The project path [default: .]
 
 OPTIONS:
     -h, --help    Print help information
diff --git a/docs/upgrade.md b/docs/upgrade.md
new file mode 100644
index 0000000..2d127fa
--- /dev/null
+++ b/docs/upgrade.md
@@ -0,0 +1,15 @@
+# upgrade
+
+This subcommand upgrades the app with the last template updates.
+
+```bash
+$ lenra upgrade --help
+lenra-upgrade 
+Upgrade the app with the last template updates
+
+USAGE:
+    lenra upgrade
+
+OPTIONS:
+    -h, --help    Print help information
+```
diff --git a/src/cli/init.rs b/src/cli/init.rs
deleted file mode 100644
index 44a3b2b..0000000
--- a/src/cli/init.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use async_trait::async_trait;
-use clap;
-
-use crate::cli::CliCommand;
-use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
-use crate::errors::Result;
-
-#[derive(clap::Args)]
-pub struct Init {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-}
-
-#[async_trait]
-impl CliCommand for Init {
-    async fn run(&self) -> Result<()> {
-        let conf = load_config_file(&self.config).unwrap();
-        // TODO: check the components API version
-        conf.generate_docker_files()
-    }
-}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index d50bb46..19ae566 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -4,19 +4,19 @@ pub use clap::{Args, Parser, Subcommand};
 use crate::errors::Result;
 
 use self::{
-    build::Build, check::Check, dev::Dev, init::Init, logs::Logs, new::New, start::Start,
-    stop::Stop, update::Update,
+    build::Build, check::Check, dev::Dev, logs::Logs, new::New, start::Start, stop::Stop,
+    update::Update, upgrade::Upgrade,
 };
 
 mod build;
 mod check;
 mod dev;
-mod init;
 mod logs;
 mod new;
 mod start;
 mod stop;
 mod update;
+mod upgrade;
 
 /// The Lenra command line interface
 #[derive(Parser)]
@@ -46,8 +46,8 @@ pub enum Command {
     Stop(Stop),
     /// Start the app in an interactive mode
     Dev(Dev),
-    /// Generates dockerfile and docker compose file with the init command
-    Init(Init),
+    /// Upgrade the app with the last template updates
+    Upgrade(Upgrade),
     /// Update the tools Docker images
     Update(Update),
     /// Checks the running app
@@ -64,7 +64,7 @@ impl CliCommand for Command {
             Command::Logs(logs) => logs.run(),
             Command::Stop(stop) => stop.run(),
             Command::Dev(dev) => dev.run(),
-            Command::Init(init) => init.run(),
+            Command::Upgrade(upgrade) => upgrade.run(),
             Command::Update(update) => update.run(),
             Command::Check(check) => check.run(),
         }
diff --git a/src/cli/new.rs b/src/cli/new.rs
index b3bc07a..b844a63 100644
--- a/src/cli/new.rs
+++ b/src/cli/new.rs
@@ -4,14 +4,14 @@
 
 use async_trait::async_trait;
 pub use clap::Args;
-use lazy_static::lazy_static;
 use log;
-use regex::Regex;
 use std::fs;
-use tokio::process::Command;
 
 use crate::cli::CliCommand;
+use crate::config::LENRA_CACHE_DIRECTORY;
 use crate::errors::{Error, Result};
+use crate::git::get_current_commit;
+use crate::template::{clone_template, normalize_template, TEMPLATE_DATA_FILE, TEMPLATE_GIT_DIR};
 
 #[derive(Args)]
 pub struct New {
@@ -22,83 +22,32 @@ pub struct New {
     pub template: String,
 
     /// The project path
-    #[clap(parse(from_os_str))]
+    #[clap(parse(from_os_str), default_value = ".")]
     path: std::path::PathBuf,
 }
 
-lazy_static! {
-    static ref TEMPLATE_SHORT_REGEX: Regex =
-        Regex::new(r"^(template-)?([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
-}
-
 #[async_trait]
 impl CliCommand for New {
     async fn run(&self) -> Result<()> {
-        if self.path.exists() {
-            return Err(Error::Custom(format!(
-                "The path '{}' already exists",
-                self.path.display()
-            )));
-        }
+        let template = normalize_template(self.template.clone());
 
-        let template = if TEMPLATE_SHORT_REGEX.is_match(self.template.as_str()) {
-            format!(
-                "https://github.com/lenra-io/template-{}",
-                TEMPLATE_SHORT_REGEX.replace(self.template.as_str(), "$2")
-            )
-        } else {
-            self.template.clone()
-        };
+        clone_template(template.clone(), self.path.clone()).await?;
 
-        log::debug!(
-            "clone the template {} into {}",
-            template,
-            self.path.display()
-        );
-        Command::new("git")
-            .kill_on_drop(true)
-            .arg("clone")
-            .arg("--single-branch")
-            .arg("--depth")
-            .arg("1")
-            .arg(template)
-            .arg(self.path.as_os_str())
-            .spawn()?
-            .wait_with_output()
-            .await
-            .map_err(Error::from)?;
+        // create `.template` file to save template repo url and commit
+        let git_dir = self.path.join(".git");
+        let commit = get_current_commit(Some(git_dir.clone())).await?;
+        fs::write(
+            self.path.join(TEMPLATE_DATA_FILE),
+            format!("{}\n{}", template, commit),
+        )
+        .map_err(Error::from)?;
 
-        log::debug!("remove git directory");
-        fs::remove_dir_all(self.path.join(".git")).unwrap();
+        log::debug!("move git directory");
+        // create the `.lenra` cache directory
+        let cache_dir = self.path.join(LENRA_CACHE_DIRECTORY);
+        fs::create_dir_all(cache_dir.clone()).unwrap();
+        fs::rename(git_dir, cache_dir.join(TEMPLATE_GIT_DIR))?;
 
-        log::debug!("init git project");
-        Command::new("git")
-            .kill_on_drop(true)
-            .current_dir(self.path.as_os_str())
-            .arg("init")
-            .spawn()?
-            .wait_with_output()
-            .await
-            .map_err(Error::from)?;
-        Command::new("git")
-            .kill_on_drop(true)
-            .current_dir(self.path.as_os_str())
-            .arg("add")
-            .arg(".")
-            .spawn()?
-            .wait_with_output()
-            .await
-            .map_err(Error::from)?;
-        Command::new("git")
-            .kill_on_drop(true)
-            .current_dir(self.path.as_os_str())
-            .arg("commit")
-            .arg("-m")
-            .arg("Init project")
-            .spawn()?
-            .wait_with_output()
-            .await
-            .map_err(Error::from)?;
         Ok(())
     }
 }
diff --git a/src/cli/upgrade.rs b/src/cli/upgrade.rs
new file mode 100644
index 0000000..7ce79f6
--- /dev/null
+++ b/src/cli/upgrade.rs
@@ -0,0 +1,116 @@
+use std::fs;
+use std::path::Path;
+use std::process::Stdio;
+
+use async_trait::async_trait;
+use clap;
+use rustyline::Editor;
+
+use crate::cli::CliCommand;
+use crate::command::get_command_output;
+use crate::config::LENRA_CACHE_DIRECTORY;
+use crate::errors::{Error, Result};
+use crate::git::{self, create_git_command, get_current_commit};
+use crate::template::{
+    clone_template, get_template_data, save_template_data, TemplateData, TEMPLATE_GIT_DIR,
+    TEMPLATE_TEMP_DIR,
+};
+
+#[derive(clap::Args)]
+pub struct Upgrade {}
+
+#[async_trait]
+impl CliCommand for Upgrade {
+    async fn run(&self) -> Result<()> {
+        // get template data
+        let template_data = get_template_data().await?;
+        let git_dir = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_GIT_DIR);
+
+        if git_dir.is_dir() {
+            // update the template repo
+            git::fetch(Some(git_dir.clone())).await?;
+        } else {
+            let template_tmp = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_TEMP_DIR);
+            // clone template project
+            clone_template(template_data.template.clone(), template_tmp.clone()).await?;
+            fs::rename(template_tmp.join(".git"), git_dir.clone())?;
+            fs::remove_dir_all(template_tmp)?;
+        }
+
+        let current_commit = get_current_commit(Some(git_dir.clone())).await?;
+        if let Some(commit) = template_data.commit {
+            if commit == current_commit {
+                println!("This application is already up to date");
+                return Ok(());
+            }
+
+            // get diff between previous commit and current commit
+            let patch_file = Path::new(LENRA_CACHE_DIRECTORY)
+                .join(format!("patch.{}-{}.diff", commit, current_commit));
+            log::debug!(
+                "create patch between {} and {}: {:?}",
+                commit,
+                current_commit,
+                patch_file
+            );
+            let mut cmd = create_git_command();
+            cmd.arg("--git-dir")
+                .arg(git_dir.as_os_str())
+                .arg("diff")
+                .arg(commit)
+                .arg(current_commit.clone());
+            let patch = get_command_output(cmd).await?;
+            fs::write(patch_file.clone(), patch)?;
+
+            // apply a patch
+            log::debug!("apply patch on project");
+            let mut cmd = create_git_command();
+            cmd.arg("apply")
+                .arg(patch_file)
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit());
+            cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
+        } else {
+            // ask for user confirmation
+            if !confirm_checkout()? {
+                println!("Upgrade canceled");
+                return Ok(());
+            }
+
+            // checkout the template in the current dir
+            log::debug!("checkout the template");
+            let mut cmd = create_git_command();
+            cmd.arg("--git-dir")
+                .arg(git_dir.as_os_str())
+                .arg("checkout")
+                .arg("HEAD")
+                .arg("--")
+                .arg(".")
+                .stdout(Stdio::inherit())
+                .stderr(Stdio::inherit());
+            cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
+        }
+        // save template data
+        save_template_data(TemplateData {
+            template: template_data.template,
+            commit: Some(current_commit),
+        })
+        .await
+    }
+}
+
+fn confirm_checkout() -> Result<bool> {
+    let mut rl = Editor::<()>::new()?;
+    println!("There is no template last commit in this project, the template files will checked out to your app.\nMake sure your project is saved (for example with git).");
+    loop {
+        let res = rl
+            .readline("Checkout the template ? [y/N] ")?
+            .trim()
+            .to_lowercase();
+        if res == "y" || res == "yes" {
+            return Ok(true);
+        } else if res.is_empty() || res == "n" || res == "no" {
+            return Ok(false);
+        }
+    }
+}
diff --git a/src/command.rs b/src/command.rs
new file mode 100644
index 0000000..33af2ad
--- /dev/null
+++ b/src/command.rs
@@ -0,0 +1,22 @@
+use tokio::process::Command;
+
+use crate::errors::{CommandError, Error, Result};
+
+pub fn create_command(cmd: &str) -> Command {
+    let mut cmd = Command::new(cmd);
+    cmd.kill_on_drop(true);
+    cmd
+}
+
+pub async fn get_command_output(command: Command) -> Result<String> {
+    let mut command = Command::from(command);
+    let output = command.output().await?;
+
+    if !output.status.success() {
+        return Err(Error::Command(CommandError { command, output }));
+    }
+
+    String::from_utf8(output.stdout)
+        .map(|name| name.trim().to_string())
+        .map_err(Error::from)
+}
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 16f531b..7afa5b1 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -324,7 +324,7 @@ pub async fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
         APP_BASE_IMAGE,
         current_dir_name().unwrap_or(APP_DEFAULT_IMAGE.to_string())
     );
-    let default_app_tag = match get_current_branch().await {
+    let default_app_tag = match get_current_branch(None).await {
         Ok(branch_name) => normalize_tag(branch_name),
         _ => APP_DEFAULT_IMAGE_TAG.to_string(),
     };
@@ -480,7 +480,7 @@ mod test_get_services_images {
     #[tokio::test]
     async fn branch_name() {
         git::get_current_branch
-            .mock_safe(|| MockResult::Return(Box::pin(async move { Ok("test".to_string()) })));
+            .mock_safe(|_| MockResult::Return(Box::pin(async move { Ok("test".to_string()) })));
         let images: ServiceImages = get_services_images(&None).await;
         assert_eq!(
             images.get(&Service::App),
@@ -490,7 +490,7 @@ mod test_get_services_images {
 
     #[tokio::test]
     async fn path_branch_name() {
-        git::get_current_branch.mock_safe(|| {
+        git::get_current_branch.mock_safe(|_| {
             MockResult::Return(Box::pin(async move {
                 Ok("prefixed/branch-name_withUnderscore".to_string())
             }))
@@ -517,7 +517,7 @@ mod test_get_services_images {
             hash
         );
 
-        git::get_current_branch.mock_safe(move || {
+        git::get_current_branch.mock_safe(move |_| {
             let branch = branch_name.clone();
             MockResult::Return(Box::pin(async move { Ok(branch) }))
         });
diff --git a/src/git.rs b/src/git.rs
index 83f1bfb..4ee51ac 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -1,25 +1,49 @@
-use crate::errors::{CommandError, Error, Result};
-use tokio::process::Command;
+use std::path::PathBuf;
+
+use crate::{
+    command::{create_command, get_command_output},
+    errors::{Error, Result},
+};
+use tokio::process;
 
 #[cfg(test)]
 use mocktopus::macros::mockable;
 
+pub fn create_git_command() -> process::Command {
+    create_command("git")
+}
+
+#[cfg_attr(test, mockable)]
+pub async fn get_current_branch(git_dir: Option<PathBuf>) -> Result<String> {
+    let mut cmd = create_git_command();
+    if let Some(dir) = git_dir {
+        cmd.arg("--git-dir").arg(dir.as_os_str());
+    }
+    cmd.arg("rev-parse").arg("--abbrev-ref").arg("HEAD");
+    get_command_output(cmd).await
+}
+
 #[cfg_attr(test, mockable)]
-pub async fn get_current_branch() -> Result<String> {
-    let mut command = Command::new("git");
-    let output = command
-        .kill_on_drop(true)
-        .arg("rev-parse")
-        .arg("--abbrev-ref")
-        .arg("HEAD")
-        .output()
-        .await?;
-
-    if !output.status.success() {
-        return Err(Error::Command(CommandError { command, output }));
+pub async fn get_current_commit(git_dir: Option<PathBuf>) -> Result<String> {
+    let mut cmd = create_git_command();
+    if let Some(dir) = git_dir {
+        cmd.arg("--git-dir").arg(dir.as_os_str());
     }
+    cmd.arg("rev-parse").arg("HEAD");
+    get_command_output(cmd).await
+}
+
+pub async fn fetch(git_dir: Option<PathBuf>) -> Result<()> {
+    log::debug!("git fetch {:?}", git_dir);
+    let mut cmd = create_git_command();
+
+    if let Some(dir) = git_dir {
+        cmd.arg("--git-dir").arg(dir.as_os_str());
+    }
+
+    cmd.arg("fetch");
+
+    cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
 
-    String::from_utf8(output.stdout)
-        .map(|name| name.trim().to_string())
-        .map_err(Error::from)
+    Ok(())
 }
diff --git a/src/main.rs b/src/main.rs
index 96f14ce..919a0b9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,6 +8,7 @@ use env_logger;
 use errors::Result;
 
 mod cli;
+mod command;
 mod config;
 mod devtool;
 mod docker;
@@ -16,6 +17,7 @@ mod errors;
 mod git;
 mod keyboard_event;
 mod matching;
+mod template;
 
 // #![cfg_attr(test, feature(proc_macro_hygiene))]
 #[tokio::main]
diff --git a/src/template.rs b/src/template.rs
new file mode 100644
index 0000000..c2eeede
--- /dev/null
+++ b/src/template.rs
@@ -0,0 +1,124 @@
+use std::{
+    collections::HashMap,
+    fs,
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    command::get_command_output,
+    config::LENRA_CACHE_DIRECTORY,
+    errors::{Error, Result},
+    git::create_git_command,
+};
+use lazy_static::lazy_static;
+use log;
+use regex::Regex;
+use rustyline::Editor;
+
+pub const TEMPLATE_DATA_FILE: &str = ".template";
+pub const TEMPLATE_GIT_DIR: &str = "template.git";
+pub const TEMPLATE_TEMP_DIR: &str = "template.tmp";
+
+lazy_static! {
+    static ref TEMPLATE_ALIASES: HashMap<&'static str, &'static str> = vec![
+        ("js", "javascript"),
+        ("ts", "typescript"),
+        ("rs", "rust"),
+        ("py", "python"),
+    ]
+    .into_iter()
+    .collect();
+}
+
+lazy_static! {
+    pub static ref TEMPLATE_SHORT_REGEX: Regex =
+        Regex::new(r"^(template-)?([0-9a-zA-Z]+([_-][0-9a-zA-Z]+)*)$").unwrap();
+}
+
+pub struct TemplateData {
+    pub template: String,
+    pub commit: Option<String>,
+}
+
+pub fn normalize_template(template: String) -> String {
+    if TEMPLATE_SHORT_REGEX.is_match(template.as_str()) {
+        // Replace aliases
+        let &name = TEMPLATE_ALIASES
+            .get(template.as_str())
+            .unwrap_or(&template.as_str());
+
+        format!(
+            "https://github.com/lenra-io/template-{}",
+            TEMPLATE_SHORT_REGEX.replace(name, "$2")
+        )
+    } else {
+        template.clone()
+    }
+}
+
+pub async fn clone_template(template: String, target_dir: PathBuf) -> Result<()> {
+    log::debug!(
+        "clone the template {} into {}",
+        template,
+        target_dir.display()
+    );
+    create_git_command()
+        .arg("clone")
+        .arg("--single-branch")
+        .arg("--depth")
+        .arg("1")
+        .arg(template)
+        .arg(target_dir.as_os_str())
+        .spawn()?
+        .wait_with_output()
+        .await
+        .map_err(Error::from)?;
+
+    Ok(())
+}
+
+pub async fn get_template_data() -> Result<TemplateData> {
+    let template_data_file = Path::new(TEMPLATE_DATA_FILE);
+    let git_dir = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_GIT_DIR);
+    if template_data_file.exists() {
+        let template_data = fs::read_to_string(template_data_file).map_err(Error::from)?;
+        let template_data: Vec<&str> = template_data.split("\n").collect();
+        Ok(TemplateData {
+            template: template_data[0].into(),
+            commit: Some(template_data[1].into()),
+        })
+    } else if git_dir.exists() {
+        let mut cmd = create_git_command();
+        cmd.arg("--git-dir")
+            .arg(git_dir.as_os_str())
+            .arg("config")
+            .arg("--get")
+            .arg("remote.origin.url");
+        let template = get_command_output(cmd).await?;
+        Ok(TemplateData {
+            template,
+            commit: None,
+        })
+    } else {
+        let mut rl = Editor::<()>::new()?;
+        println!("The '.template' file does not exist.");
+        let template = normalize_template(rl.readline("What is the template to use ? ")?);
+        Ok(TemplateData {
+            template,
+            commit: None,
+        })
+    }
+}
+
+pub async fn save_template_data(template_data: TemplateData) -> Result<()> {
+    let template_data_file = Path::new(TEMPLATE_DATA_FILE);
+    fs::write(
+        template_data_file,
+        format!(
+            "{}\n{}",
+            template_data.template,
+            template_data.commit.unwrap()
+        ),
+    )
+    .map_err(Error::from)
+}

From f17390e9029186b818838dc191a85d4c1ee97078 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Tue, 4 Apr 2023 12:48:51 +0200
Subject: [PATCH 56/76] docs: Funding button (#219)

---
 .github/FUNDING.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..8a47b7f
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: [lenra-io]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From b18c8053f738c1f5b6acf90ff5f1f6d43b67216e Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Date: Fri, 7 Apr 2023 09:29:37 +0200
Subject: [PATCH 57/76] docs: HTML documentation generation (#221)

---
 .github/workflows/build_ci.yml             |  42 ++++++-
 .releaserc.yml                             |   4 +
 README.md                                  | 131 +--------------------
 docs-page-builder/.gitignore               |   2 +
 docs-page-builder/build.js                 |  63 ++++++++++
 docs-page-builder/package-lock.json        |  92 +++++++++++++++
 docs-page-builder/package.json             |  17 +++
 docs/{ => commands}/build.md               |   4 +-
 docs/{check.md => commands/check/index.md} |   6 +-
 docs/{ => commands}/check/template.md      |   5 +-
 docs/{ => commands}/dev/continue.md        |   4 +-
 docs/{ => commands}/dev/expose.md          |   4 +-
 docs/{dev.md => commands/dev/index.md}     |  10 +-
 docs/{ => commands}/dev/interactive.md     |   4 +-
 docs/{ => commands}/dev/reload.md          |   4 +-
 docs/{ => commands}/dev/terminal.md        |   7 +-
 docs/commands/index.md                     |  42 +++++++
 docs/{ => commands}/logs.md                |   4 +-
 docs/{ => commands}/new.md                 |   4 +-
 docs/{ => commands}/start.md               |   4 +-
 docs/{ => commands}/stop.md                |   4 +-
 docs/{ => commands}/update.md              |   4 +-
 docs/{ => commands}/upgrade.md             |   4 +-
 docs/config-file.md                        |  44 +++++++
 docs/index.md                              |  35 ++++++
 install.md                                 |  46 ++++++++
 26 files changed, 439 insertions(+), 151 deletions(-)
 create mode 100644 docs-page-builder/.gitignore
 create mode 100644 docs-page-builder/build.js
 create mode 100644 docs-page-builder/package-lock.json
 create mode 100644 docs-page-builder/package.json
 rename docs/{ => commands}/build.md (85%)
 rename docs/{check.md => commands/check/index.md} (76%)
 rename docs/{ => commands}/check/template.md (80%)
 rename docs/{ => commands}/dev/continue.md (72%)
 rename docs/{ => commands}/dev/expose.md (84%)
 rename docs/{dev.md => commands/dev/index.md} (74%)
 rename docs/{ => commands}/dev/interactive.md (88%)
 rename docs/{ => commands}/dev/reload.md (73%)
 rename docs/{ => commands}/dev/terminal.md (86%)
 create mode 100644 docs/commands/index.md
 rename docs/{ => commands}/logs.md (93%)
 rename docs/{ => commands}/new.md (87%)
 rename docs/{ => commands}/start.md (81%)
 rename docs/{ => commands}/stop.md (75%)
 rename docs/{ => commands}/update.md (87%)
 rename docs/{ => commands}/upgrade.md (73%)
 create mode 100644 docs/config-file.md
 create mode 100644 docs/index.md
 create mode 100644 install.md

diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
index e8d0b83..fca0a29 100644
--- a/.github/workflows/build_ci.yml
+++ b/.github/workflows/build_ci.yml
@@ -172,11 +172,47 @@ jobs:
         name: lenra-${{ matrix.os }}-${{ matrix.arch }}
         path: lenra-${{ matrix.os }}-${{ matrix.arch }}.*
 
+  generate_doc_artifact:
+    name: Generate doc artifact
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: read
+    timeout-minutes: 10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+      - name: Setup node deps
+        run: |
+          cd docs-page-builder/
+          npm install
+          npm run build
+      - name: Compress tar.gz
+        run: |
+          cd docs-page-builder/build/
+          tar czvf lenra-cli-docs.tar.gz *
+          mv lenra-cli-docs.tar.gz ../..
+      - name: Compress zip
+        run: |
+          cd docs-page-builder/build/
+          zip -r lenra-cli-docs.zip *
+          mv lenra-cli-docs.zip ../..
+      - name: Documentation artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: lenra-cli-docs
+          path: |
+            lenra-cli-docs.tar.gz
+            lenra-cli-docs.zip
 
   publish:
     name: publish
-    needs: [build, get-next-version]
-    if: github.ref_name == 'main' || github.ref_name == 'beta'
+    needs: [build, generate_doc_artifact, get-next-version]
+    if: github.ref_name == 'main' || github.ref_name == 'beta' || github.ref_name == 'alpha'
     runs-on: ubuntu-latest
     env:
       VERSION: ${{ needs.get-next-version.outputs.new-release-version }}
@@ -200,7 +236,7 @@ jobs:
       shell: bash
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: npx -p conventional-changelog-conventionalcommits@5 -p @semantic-release/git -p semantic-release-export-data -p semantic-release@19 semantic-release
+      run: npx -p conventional-changelog-conventionalcommits@5 -p @semantic-release/git -p semantic-release-export-data -p https://github.com/Tlepel/semantic-release.git#fix-versions-share-head semantic-release
 
     - name: Install cargo-edit
       if: ${{ steps.release.outputs.new-release-published }}
diff --git a/.releaserc.yml b/.releaserc.yml
index 21f18d4..afad749 100644
--- a/.releaserc.yml
+++ b/.releaserc.yml
@@ -12,4 +12,8 @@ plugins:
   - - "@semantic-release/github"
     - assets:
       - path: artifacts/*/*
+      - path: lenra-cli-docs/lenra-cli-docs.zip
+        name: lenra-cli-docs-${nextRelease.gitTag}.zip
+      - path: lenra-cli-docs/lenra-cli-docs.tar.gz
+        name: lenra-cli-docs-${nextRelease.gitTag}.tar.gz
   - - "semantic-release-export-data"
diff --git a/README.md b/README.md
index aef15fc..f7b6c7d 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,9 @@
 [Request Feature](https://github.com/lenra-io/lenra_cli/issues)
 
 
+The Lenra's command line interface helps you building your Lenra app locally.
+
+
 ## What is Lenra
 
 Lenra is an open source framework to create your app using any language, and deploy it without any Ops scale, built on ethical values.
@@ -38,136 +41,10 @@ Lenra is an open source framework to create your app using any language, and dep
 <!-- GETTING STARTED -->
 ## Getting Started
 
-### Prerequisites
-
-To build and run the Lenra elements that handle your app, the Lenra CLI needs [Docker](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/).
-
-You can also install the [Docker buildx command](https://docs.docker.com/build/buildx/install/) to use the [Buildkit optimization given by Dofigen](https://github.com/lenra-io/dofigen).
-
-Install the Lenra CLI using one of the next possibilities.
-
-#### Download the binary
-
-You can download the binary from [the release page](https://github.com/lenra-io/lenra_cli/releases) and add it to your path environment variable.
-
-#### Cargo install
-
-First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
-
-Then use the next command to install the Lenra's cli:
-
-```bash
-cargo install lenra_cli
-```
-
-Since the CLI is not released yet, you have to target a [pre-release version](https://github.com/lenra-io/lenra_cli/releases) like that:
-
-```bash
-cargo install lenra_cli@v1.0.0-beta.24
-```
-
-#### Build it from sources
-
-First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
-
-Then clone this repository and install it with Cargo:
-
-```bash
-git clone https://github.com/lenra-io/lenra_cli.git
-cargo install --path .
-```
-
-<p align="right">(<a href="#top">back to top</a>)</p>
-
-### How to use it
-
-Use the help options to understand how to use it:
-
-```bash
-$ lenra --help
-lenra_cli 0.0.0
-The Lenra command line interface
-
-USAGE:
-    lenra <SUBCOMMAND>
-
-OPTIONS:
-    -h, --help       Print help information
-    -V, --version    Print version information
-
-SUBCOMMANDS:
-    build      Build your app in release mode
-    check      Checks the running app
-    dev        Start the app in an interactive mode
-    help       Print this message or the help of the given subcommand(s)
-    logs       View output from the containers
-    new        Create a new Lenra app project
-    start      Start your app previously built with the build command
-    stop       Stop your app previously started with the start command
-    update     Update the tools Docker images
-    upgrade    Upgrade the app with the last template updates
-```
-
-<p align="right">(<a href="#top">back to top</a>)</p>
-
-## Subcommands
-
-This tool contains many subcommands to help you doing what you need.
-
-- [new](docs/new.md): creates a new Lenra app project
-- [dev](docs/dev.md): starts your app in dev mode
-- [update](docs/update.md): updates the tools Docker images
-- [upgrade](docs/upgrade.md): upgrades the app with the last template updates
-- [build](docs/build.md): builds the Lenra app of the current directory
-- [start](docs/start.md): starts your app previously built with the build command
-- [logs](docs/logs.md): displays output from the containers
-- [stop](docs/stop.md): stops your app previously started with the start command
-- [check](docs/check.md): checks the running app
-
+To start using Lenra to build your app, [install the CLI](install.md) and learn [how to use it](docs/index.md).
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
-## Configuration file
-
-The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
-
-Here is an example using a Dofigen file:
-
-```yaml
-componentsApi: "1.0"
-generator:
-  dofigen: dofigen.yml
-```
-
-### Configuration
-
-The configuration is the main element of the file:
-
-| Field           | Type                    | Description                 |
-| --------------- | ----------------------- | --------------------------- |
-| `componentsApi` | String                  | The components API version  |
-| `generator`     | [Generator](#generator) | The generator configuration |
-
-### Generator
-
-The generator define your application is built. There are many configurators:
-
-- [Dofigen](#dofigen)
-- [Docker](#docker)
-
-#### Dofigen
-
-The Dofigen generator use a [Dofigen](https://github.com/lenra-io/dofigen) configuration to generate the Docker image.
-
-The Dofigen configuration can be the path to a Dofigen file or it content directly.
-
-#### Docker
-
-The Docker generator use a Dockerfile to generate the Docker image.
-
-The Dockerfile can be the path to a file or it content directly.
-
-<p align="right">(<a href="#top">back to top</a>)</p>
 
 <!-- CONTRIBUTING -->
 ## Contributing
diff --git a/docs-page-builder/.gitignore b/docs-page-builder/.gitignore
new file mode 100644
index 0000000..b51ea71
--- /dev/null
+++ b/docs-page-builder/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+build/
\ No newline at end of file
diff --git a/docs-page-builder/build.js b/docs-page-builder/build.js
new file mode 100644
index 0000000..05be2a2
--- /dev/null
+++ b/docs-page-builder/build.js
@@ -0,0 +1,63 @@
+import * as fs from 'fs/promises';
+import Showdown from 'showdown';
+import fm from 'front-matter';
+import path from 'path';
+
+const converter = new Showdown.Converter({ tables: true });
+converter.addExtension({
+    type: 'output',
+    filter: function (text) {
+        const replaced = text
+            // Replace markdown links to html
+            .replace(/href="([^"]+)"/g, (_, href) => `href="${href.replace(/\.md(#|$)/, '.html$1')}"`);
+        return replaced;
+    }
+});
+
+const githubBasPath = "https://github.com/lenra-io/lenra_cli/blob/beta/";
+
+const docsDir = path.join("..", "docs");
+const outDir = "build";
+
+async function buildFiles(src, dest) {
+    const files = await fs.readdir(src, { withFileTypes: true });
+    const promises = files.map(info => {
+        const filePath = path.join(src, info.name);
+        if (info.isFile()) return buildFile(filePath, info.name, dest);
+        if (!info.isDirectory()) throw new Error("Error building", filePath);
+        return buildFiles(filePath, path.join(dest, info.name));
+    });
+    return Promise.all(promises);
+}
+
+/**
+ * Build the given file to the target directory
+ * @param {string} src 
+ * @param {string} filename 
+ * @param {string} destDir 
+ */
+async function buildFile(src, filename, destDir) {
+    await fs.mkdir(destDir, { recursive: true });
+    if (filename.endsWith(".md")) {
+        console.log(`buiding ${src} to ${destDir}`);
+        const fmResult = fm(await fs.readFile(src, 'utf8'));
+        const baseName = filename.replace(/.md$/, "");
+        const title = fmResult.attributes.title ?? (filename === "index.md" ? undefined : baseName);
+        const destFile = path.join(destDir, `${baseName}.html`);
+        const destJsonFile = destFile + '.json';
+        return Promise.all([
+            fs.writeFile(destFile, converter.makeHtml(fmResult.body), 'utf8'),
+            fs.writeFile(destJsonFile, JSON.stringify({
+                ...fmResult.attributes,
+                title,
+                sourceFile: githubBasPath + src.replace(/^..\//, '')
+            }), 'utf8')
+        ]);
+    }
+    else {
+        return fs.copyFile(src, path.join(destDir, filename));
+    }
+}
+
+console.log("Start building doc pages");
+buildFiles(docsDir, outDir).then(_ => console.log("Doc pages built"));
diff --git a/docs-page-builder/package-lock.json b/docs-page-builder/package-lock.json
new file mode 100644
index 0000000..71e3cc6
--- /dev/null
+++ b/docs-page-builder/package-lock.json
@@ -0,0 +1,92 @@
+{
+  "name": "docs-page-builder",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "docs-page-builder",
+      "version": "1.0.0",
+      "license": "MIT",
+      "devDependencies": {
+        "front-matter": "^4.0.2",
+        "showdown": "^2.1.0"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/front-matter": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz",
+      "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==",
+      "dev": true,
+      "dependencies": {
+        "js-yaml": "^3.13.1"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/showdown": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz",
+      "integrity": "sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^9.0.0"
+      },
+      "bin": {
+        "showdown": "bin/showdown.js"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://www.paypal.me/tiviesantos"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    }
+  }
+}
diff --git a/docs-page-builder/package.json b/docs-page-builder/package.json
new file mode 100644
index 0000000..1a3875f
--- /dev/null
+++ b/docs-page-builder/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "docs-page-builder",
+  "version": "1.0.0",
+  "description": "Generates HTML pages from markdown files",
+  "type": "module",
+  "main": "build.js",
+  "scripts": {
+    "build": "node build.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Lenra",
+  "license": "MIT",
+  "devDependencies": {
+    "front-matter": "^4.0.2",
+    "showdown": "^2.1.0"
+  }
+}
\ No newline at end of file
diff --git a/docs/build.md b/docs/commands/build.md
similarity index 85%
rename from docs/build.md
rename to docs/commands/build.md
index 27bb7e4..21d5d88 100644
--- a/docs/build.md
+++ b/docs/commands/build.md
@@ -1,4 +1,6 @@
-# build
+---
+description: This subcommand builds the Lenra app of the current directory.
+---
 
 This subcommand builds the Lenra app of the current directory.
 The app configuration is defined by a [configuration file](#configuration-file).
diff --git a/docs/check.md b/docs/commands/check/index.md
similarity index 76%
rename from docs/check.md
rename to docs/commands/check/index.md
index a5d88c1..69db697 100644
--- a/docs/check.md
+++ b/docs/commands/check/index.md
@@ -1,4 +1,6 @@
-# check
+---
+description: This subcommands check the running app.
+---
 
 This subcommands check the running app.
 
@@ -22,4 +24,4 @@ SUBCOMMANDS:
 
 This tool contains many subcommands to help you doing what you need.
 
-- [template](docs/check/template.md): checks the current project as a template
\ No newline at end of file
+- [template](./template.md): checks the current project as a template
\ No newline at end of file
diff --git a/docs/check/template.md b/docs/commands/check/template.md
similarity index 80%
rename from docs/check/template.md
rename to docs/commands/check/template.md
index aeb4fc2..86d12dd 100644
--- a/docs/check/template.md
+++ b/docs/commands/check/template.md
@@ -1,4 +1,7 @@
-# check template
+---
+title: check template
+description: This subcommands checks the running app as a Lenra template app.
+---
 
 This subcommands checks the running app as a Lenra template app.
 
diff --git a/docs/dev/continue.md b/docs/commands/dev/continue.md
similarity index 72%
rename from docs/dev/continue.md
rename to docs/commands/dev/continue.md
index 7aef651..c7a0b8c 100644
--- a/docs/dev/continue.md
+++ b/docs/commands/dev/continue.md
@@ -1,4 +1,6 @@
-# continue
+---
+description: This subcommand continues the previous logs command since the last displayed logs.
+---
 
 This subcommand continues the previous logs command since the last displayed logs.
 
diff --git a/docs/dev/expose.md b/docs/commands/dev/expose.md
similarity index 84%
rename from docs/dev/expose.md
rename to docs/commands/dev/expose.md
index 86a8f96..6d2f089 100644
--- a/docs/dev/expose.md
+++ b/docs/commands/dev/expose.md
@@ -1,4 +1,6 @@
-# expose
+---
+description: This subcommand exposes the containers ports.
+---
 
 This subcommand exposes the containers ports.
 
diff --git a/docs/dev.md b/docs/commands/dev/index.md
similarity index 74%
rename from docs/dev.md
rename to docs/commands/dev/index.md
index 3d1f0fc..3600019 100644
--- a/docs/dev.md
+++ b/docs/commands/dev/index.md
@@ -1,4 +1,6 @@
-# dev
+---
+description: This subcommand starts the Lenra app of the current directory in dev mode.
+---
 
 This subcommand starts the Lenra app of the current directory in dev mode.
 
@@ -19,7 +21,5 @@ OPTIONS:
     -t, --terminal           Open the dev terminal instead of starting the interactive mode
 ```
 
-While displaying logs in dev mode, you can run some [interactive commands](dev/interactive.md) by pressing the good keys.
-You also can press `Ctrl + C` to start our [dev terminal](dev/terminal.md).
-
-
+While displaying logs in dev mode, you can run some [interactive commands](./interactive.md) by pressing the good keys.
+You also can press `Ctrl + C` to start our [dev terminal](./terminal.md).
diff --git a/docs/dev/interactive.md b/docs/commands/dev/interactive.md
similarity index 88%
rename from docs/dev/interactive.md
rename to docs/commands/dev/interactive.md
index 9341022..b96ba62 100644
--- a/docs/dev/interactive.md
+++ b/docs/commands/dev/interactive.md
@@ -1,4 +1,6 @@
-# Interactive commands
+---
+description: Run interactive commands through keyboard shortcuts.
+---
 
 When displaying logs in dev mode with the follow option (with [`lenra dev`](../dev.md)), you can run interactive commands through keyboard shortcuts.
 
diff --git a/docs/dev/reload.md b/docs/commands/dev/reload.md
similarity index 73%
rename from docs/dev/reload.md
rename to docs/commands/dev/reload.md
index 675926d..b382201 100644
--- a/docs/dev/reload.md
+++ b/docs/commands/dev/reload.md
@@ -1,4 +1,6 @@
-# reload
+---
+description: This subcommand reloads the app by rebuilding and restarting it.
+---
 
 This subcommand reloads the app by rebuilding and restarting it.
 
diff --git a/docs/dev/terminal.md b/docs/commands/dev/terminal.md
similarity index 86%
rename from docs/dev/terminal.md
rename to docs/commands/dev/terminal.md
index 3da1587..44e8b1e 100644
--- a/docs/dev/terminal.md
+++ b/docs/commands/dev/terminal.md
@@ -1,4 +1,7 @@
-# Dev terminal
+---
+title: Dev terminal
+description: The dev terminal is a command prompt that let  you run only Lenra specific commands. It has his own history.
+---
 
 The dev terminal is a command prompt that let  you run only Lenra specific commands. It has his own history.
 
@@ -36,4 +39,4 @@ This tools contains many subcommands to help you do what you need.
 - [exit](../stop.md): `stop` alias
 - [expose](./expose.md): exposes the app ports
 - [logs](../logs.md): displays output from the containers
-- [check](../check.md): checks the running app
\ No newline at end of file
+- [check](../check/index.md): checks the running app
\ No newline at end of file
diff --git a/docs/commands/index.md b/docs/commands/index.md
new file mode 100644
index 0000000..b87d6a1
--- /dev/null
+++ b/docs/commands/index.md
@@ -0,0 +1,42 @@
+---
+description: This CLI contains many subcommands to help you doing what you need.
+---
+
+This CLI contains many subcommands to help you doing what you need.
+
+- [new](./new.md): creates a new Lenra app project
+- [dev](./dev/index.md): starts your app in dev mode
+- [update](./update.md): updates the tools Docker images
+- [upgrade](./upgrade.md): upgrades the app with the last template updates
+- [build](./build.md): builds the Lenra app of the current directory
+- [start](./start.md): starts your app previously built with the build command
+- [logs](./logs.md): displays output from the containers
+- [stop](./stop.md): stops your app previously started with the start command
+- [check](./check/index.md): checks the running app
+
+Use the help options or help subcommand to understand how to use them:
+
+```bash
+$ lenra --help
+lenra_cli 0.0.0
+The Lenra command line interface
+
+USAGE:
+    lenra <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help       Print help information
+    -V, --version    Print version information
+
+SUBCOMMANDS:
+    build      Build your app in release mode
+    check      Checks the running app
+    dev        Start the app in an interactive mode
+    help       Print this message or the help of the given subcommand(s)
+    logs       View output from the containers
+    new        Create a new Lenra app project
+    start      Start your app previously built with the build command
+    stop       Stop your app previously started with the start command
+    update     Update the tools Docker images
+    upgrade    Upgrade the app with the last template updates
+```
diff --git a/docs/logs.md b/docs/commands/logs.md
similarity index 93%
rename from docs/logs.md
rename to docs/commands/logs.md
index 7c2a5ae..d221941 100644
--- a/docs/logs.md
+++ b/docs/commands/logs.md
@@ -1,4 +1,6 @@
-# logs
+---
+description: This subcommand displays output from the containers.
+---
 
 This subcommand displays output from the containers.
 
diff --git a/docs/new.md b/docs/commands/new.md
similarity index 87%
rename from docs/new.md
rename to docs/commands/new.md
index 3e065ba..d1e9b9f 100644
--- a/docs/new.md
+++ b/docs/commands/new.md
@@ -1,4 +1,6 @@
-# new
+---
+description: This subcommand creates a new Lenra app project from a given template and in a given directory.
+---
 
 This subcommand creates a new Lenra app project from a given template and in a given directory.
 The target directory must not exist.
diff --git a/docs/start.md b/docs/commands/start.md
similarity index 81%
rename from docs/start.md
rename to docs/commands/start.md
index 6c887b4..016b143 100644
--- a/docs/start.md
+++ b/docs/commands/start.md
@@ -1,4 +1,6 @@
-# start
+---
+description: This subcommand starts the Lenra app of the current directory previously built.
+---
 
 This subcommand starts the Lenra app of the current directory previously built.
 
diff --git a/docs/stop.md b/docs/commands/stop.md
similarity index 75%
rename from docs/stop.md
rename to docs/commands/stop.md
index 2988baf..f0f6ef4 100644
--- a/docs/stop.md
+++ b/docs/commands/stop.md
@@ -1,4 +1,6 @@
-# stop
+---
+description: This subcommand stops the Lenra app of the current directory and removes the Docker Compose elements.
+---
 
 This subcommand stops the Lenra app of the current directory and removes the Docker Compose elements.
 
diff --git a/docs/update.md b/docs/commands/update.md
similarity index 87%
rename from docs/update.md
rename to docs/commands/update.md
index 1801b3c..d185db2 100644
--- a/docs/update.md
+++ b/docs/commands/update.md
@@ -1,4 +1,6 @@
-# update
+---
+description: This subcommand updates the tools Docker images.
+---
 
 This subcommand updates the tools Docker images.
 
diff --git a/docs/upgrade.md b/docs/commands/upgrade.md
similarity index 73%
rename from docs/upgrade.md
rename to docs/commands/upgrade.md
index 2d127fa..d59d20f 100644
--- a/docs/upgrade.md
+++ b/docs/commands/upgrade.md
@@ -1,4 +1,6 @@
-# upgrade
+---
+description: This subcommand upgrades the app with the last template updates.
+---
 
 This subcommand upgrades the app with the last template updates.
 
diff --git a/docs/config-file.md b/docs/config-file.md
new file mode 100644
index 0000000..15b60be
--- /dev/null
+++ b/docs/config-file.md
@@ -0,0 +1,44 @@
+---
+title: lenra.yml config file
+description: The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
+---
+
+The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
+
+Here is an example using a Dofigen file:
+
+```yaml
+componentsApi: "1.0"
+generator:
+  dofigen: dofigen.yml
+```
+
+## Configuration
+
+The configuration is the main element of the file:
+
+| Field           | Type                    | Description                 |
+| --------------- | ----------------------- | --------------------------- |
+| `componentsApi` | String                  | The components API version  |
+| `generator`     | [Generator](#generator) | The generator configuration |
+
+## Generator
+
+The generator define your application is built. There are many configurators:
+
+- [Configuration](#configuration)
+- [Generator](#generator)
+  - [Dofigen](#dofigen)
+  - [Docker](#docker)
+
+### Dofigen
+
+The Dofigen generator use a [Dofigen](https://github.com/lenra-io/dofigen) configuration to generate the Docker image.
+
+The Dofigen configuration can be the path to a Dofigen file or it content directly.
+
+### Docker
+
+The Docker generator use a Dockerfile to generate the Docker image.
+
+The Dockerfile can be the path to a file or it content directly.
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..4eb4d84
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,35 @@
+---
+title: CLI
+description: The Lenra's command line interface helps you building your Lenra app locally and it's gona be your best friend !
+---
+
+The Lenra's command line interface helps you building your Lenra app locally and it's gona be your best friend !
+
+We've created many [commands](commands/index.md) to help you managing a local smaller Lenra instance to create and test your app.
+
+## Create a new app
+
+To create an app, you should use the [`lenra new` subcommand](commands/new.md) that will create a new project based on [a Lenra app template](https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers).
+
+Start it running the [`lenra dev` subcommand](commands/dev/index.md).
+Your app will be built, started and exposed on http://localhost:4000/
+
+Here are the steps to start building a JavaScript Lenra app:
+
+```bash
+# new app from javascript template in a new 'my-app' directory
+lenra new javascript my-app
+# move to the new app dir
+cd my-app
+# initialize git versionning
+git init
+# start your app
+lenra dev
+```
+
+Look the [`lenra dev` subcommand](commands/dev/index.md) to understand the new dev mode and terminal.
+
+## Configure your app container
+
+Lenra app system is based containers.
+Look at our [`lenra.yml` config file](config-file.md) to adapt your app configuration and better understand how you can tools in your app containers.
\ No newline at end of file
diff --git a/install.md b/install.md
new file mode 100644
index 0000000..272c303
--- /dev/null
+++ b/install.md
@@ -0,0 +1,46 @@
+## Prerequisites
+
+To build and run the Lenra elements that handle your app, the Lenra CLI needs [Docker](https://docs.docker.com/engine/install/) and [Docker Compose](https://docs.docker.com/compose/install/).
+
+To create a new project and upgrade it later, the CLI also needs [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) (that we hope you already use ^^).
+
+You can also install the [Docker buildx command](https://docs.docker.com/build/buildx/install/) to use the [Buildkit optimization given by Dofigen](https://github.com/lenra-io/dofigen).
+
+Install the Lenra CLI using one of the next possibilities.
+
+## Install
+
+### Download the binary
+
+You can download the binary from [the release page](https://github.com/lenra-io/lenra_cli/releases) and add it to your path environment variable.
+
+### Cargo install
+
+First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
+
+Then use the next command to install the Lenra's cli:
+
+```bash
+cargo install lenra_cli
+```
+
+Since the CLI is not released yet, you have to target a [pre-release version](https://github.com/lenra-io/lenra_cli/releases) like that:
+
+```bash
+cargo install lenra_cli@~1.0.0-beta.0
+```
+
+### Build it from sources
+
+First install Cargo, the Rust package manager: https://doc.rust-lang.org/cargo/getting-started/installation.html
+
+Then clone this repository and install it with Cargo:
+
+```bash
+git clone https://github.com/lenra-io/lenra_cli.git
+cargo install --path .
+```
+
+## And now ?
+
+Learn how to use it with [our docs website](https://docs.lenra.io).
\ No newline at end of file

From 1195c34304eb24a2794144b9fd4f77f0eac3a2a7 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Fri, 7 Apr 2023 10:20:01 +0200
Subject: [PATCH 58/76] ci: Fix semantic release

---
 .github/workflows/build_ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_ci.yml b/.github/workflows/build_ci.yml
index fca0a29..4eaf624 100644
--- a/.github/workflows/build_ci.yml
+++ b/.github/workflows/build_ci.yml
@@ -229,14 +229,14 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: "16"
+        node-version: "18"
 
     - id: release
       name: Release
       shell: bash
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: npx -p conventional-changelog-conventionalcommits@5 -p @semantic-release/git -p semantic-release-export-data -p https://github.com/Tlepel/semantic-release.git#fix-versions-share-head semantic-release
+      run: npx --force -p conventional-changelog-conventionalcommits@5 -p @semantic-release/git -p semantic-release-export-data -p https://github.com/Tlepel/semantic-release.git#fix-versions-share-head semantic-release
 
     - name: Install cargo-edit
       if: ${{ steps.release.outputs.new-release-published }}

From 7ca42a3c6d873416b445e53f25a4c9203b7a8404 Mon Sep 17 00:00:00 2001
From: Shiipou <shiishii@nocturlab.fr>
Date: Fri, 7 Apr 2023 15:27:51 +0200
Subject: [PATCH 59/76] feat: add debug config in lenra.yml  (#203)

Co-authored-by: Thomas DA ROCHA <8969556+taorepoara@users.noreply.github.com>
Co-authored-by: Thomas DA ROCHA <thomas.darocha@lenra.io>
---
 src/cli/build.rs        |  7 +++-
 src/cli/dev/terminal.rs |  4 +-
 src/cli/start.rs        |  2 +-
 src/config.rs           | 86 +++++++++++++++++++++++++++++++++--------
 src/docker_compose.rs   | 21 +++++++++-
 5 files changed, 98 insertions(+), 22 deletions(-)

diff --git a/src/cli/build.rs b/src/cli/build.rs
index b1a869f..3972ec9 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -17,6 +17,10 @@ pub struct Build {
     /// Exposes services ports.
     #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
     pub expose: Vec<Service>,
+
+    /// Remove debug access to the app.
+    #[clap(long, alias = "prod", action)]
+    pub production: bool,
 }
 
 #[async_trait]
@@ -25,7 +29,8 @@ impl CliCommand for Build {
         let conf = load_config_file(&self.config)?;
         // TODO: check the components API version
 
-        conf.generate_files(self.expose.clone()).await?;
+        conf.generate_files(self.expose.clone(), !self.production)
+            .await?;
 
         log::info!("Build the Docker image");
         compose_build().await?;
diff --git a/src/cli/dev/terminal.rs b/src/cli/dev/terminal.rs
index a4040fc..009b589 100644
--- a/src/cli/dev/terminal.rs
+++ b/src/cli/dev/terminal.rs
@@ -226,7 +226,7 @@ impl DevTermCommand {
             }
             DevTermCommand::Reload => {
                 log::debug!("Generates files");
-                conf.generate_files(context.expose.clone()).await?;
+                conf.generate_files(context.expose.clone(), true).await?;
 
                 log::debug!("Docker compose build");
                 compose_build().await?;
@@ -249,7 +249,7 @@ impl DevTermCommand {
                 }
             }
             DevTermCommand::Expose(expose) => {
-                conf.generate_files(expose.services.clone()).await?;
+                conf.generate_files(expose.services.clone(), true).await?;
 
                 compose_up().await?;
 
diff --git a/src/cli/start.rs b/src/cli/start.rs
index fa4b486..fc4f713 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -30,7 +30,7 @@ impl CliCommand for Start {
         if !dockercompose_path.exists() {
             // TODO: check the components API version
 
-            conf.generate_files(self.expose.clone()).await?;
+            conf.generate_files(self.expose.clone(), true).await?;
         }
 
         // Start the containers
diff --git a/src/config.rs b/src/config.rs
index bf6f981..9c94e77 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fs, path::PathBuf};
+use std::{collections::HashMap, fmt::Debug, fs, path::PathBuf};
 
 use dofigen_lib::{
     self, from_file_path, generate_dockerfile, generate_dockerignore, Artifact, Builder,
@@ -61,6 +61,7 @@ pub struct Dev {
     pub devtool: Option<Image>,
     pub postgres: Option<Image>,
     pub mongo: Option<Image>,
+    pub dofigen: Option<DebugDofigen>,
 }
 
 /** A Docker image */
@@ -70,6 +71,12 @@ pub struct Image {
     pub tag: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default)]
+pub struct DebugDofigen {
+    pub cmd: Option<Vec<String>>,
+    pub ports: Option<Vec<u16>>,
+}
+
 /** The application generator configuration */
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 #[serde(untagged)]
@@ -109,22 +116,25 @@ pub struct Dockerfile {
 
 impl Application {
     /// Generates all the files needed to build and run the application
-    pub async fn generate_files(&self, exposed_services: Vec<Service>) -> Result<()> {
-        self.generate_docker_files()?;
-        self.generate_docker_compose_file(exposed_services).await?;
+    pub async fn generate_files(&self, exposed_services: Vec<Service>, debug: bool) -> Result<()> {
+        self.generate_docker_files(debug)?;
+        self.generate_docker_compose_file(exposed_services, debug)
+            .await?;
         Ok(())
     }
 
-    pub fn generate_docker_files(&self) -> Result<()> {
+    pub fn generate_docker_files(&self, debug: bool) -> Result<()> {
         log::info!("Docker files generation");
         // create the `.lenra` cache directory
         fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
 
         match &self.generator {
-            Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen.clone()),
-            Generator::DofigenFile(dofigen_file) => {
-                self.build_dofigen(from_file_path(&dofigen_file.dofigen).map_err(Error::from)?)
-            }
+            // If args '--prod' is passed then not debug
+            Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen.clone(), debug),
+            Generator::DofigenFile(dofigen_file) => self.build_dofigen(
+                from_file_path(&dofigen_file.dofigen).map_err(Error::from)?,
+                debug,
+            ),
             Generator::DofigenError { dofigen: _ } => Err(Error::Custom(
                 "Your Dofigen configuration is not correct".into(),
             )),
@@ -136,7 +146,11 @@ impl Application {
         }
     }
 
-    pub async fn generate_docker_compose_file(&self, exposed_services: Vec<Service>) -> Result<()> {
+    pub async fn generate_docker_compose_file(
+        &self,
+        exposed_services: Vec<Service>,
+        debug: bool,
+    ) -> Result<()> {
         log::info!("Docker Compose file generation");
         // create the `.lenra` cache directory
         fs::create_dir_all(LENRA_CACHE_DIRECTORY).map_err(Error::from)?;
@@ -147,23 +161,55 @@ impl Application {
             DOCKERFILE_DEFAULT_PATH.iter().collect()
         };
 
-        generate_docker_compose(dockerfile, &self.dev, exposed_services)
+        generate_docker_compose(dockerfile, &self.dev, exposed_services, debug)
             .await
             .map_err(Error::from)?;
         Ok(())
     }
 
     /// Builds a Docker image from a Dofigen structure
-    fn build_dofigen(&self, image: dofigen_lib::Image) -> Result<()> {
+    fn build_dofigen(&self, image: dofigen_lib::Image, debug: bool) -> Result<()> {
         // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
-        let of_overlay = self.dofigen_of_overlay(image)?;
+        let overlay = self.dofigen_of_overlay(image)?;
+
+        // when debug add cmd and ports to the Dofigen descriptor
+        let overlay = if debug {
+            self.dofigen_debug_overlay(overlay)?
+        } else {
+            overlay
+        };
 
         // generate the Dockerfile and .dockerignore files with Dofigen
-        let dockerfile = generate_dockerfile(&of_overlay);
-        let dockerignore = generate_dockerignore(&of_overlay);
+        let dockerfile = generate_dockerfile(&overlay);
+        let dockerignore = generate_dockerignore(&overlay);
         self.save_docker_content(dockerfile, Some(dockerignore))
     }
 
+    fn dofigen_debug_overlay(&self, image: dofigen_lib::Image) -> Result<dofigen_lib::Image> {
+        log::info!("Adding debug overlay to the Dofigen descriptor");
+        let mut debug_overlay = image;
+        if let Some(dev) = &self.dev {
+            if let Some(dofigen) = &dev.dofigen {
+                if let Some(cmd) = &dofigen.cmd {
+                    let mut envs = debug_overlay.envs.unwrap();
+                    envs.insert("fprocess".to_string(), cmd.join(" "));
+                    debug_overlay.envs = Some(envs);
+                }
+                if let Some(ports) = &dofigen.ports {
+                    debug_overlay.ports = Some(
+                        debug_overlay
+                            .ports
+                            .unwrap()
+                            .into_iter()
+                            .chain(ports.into_iter().map(|&value| value))
+                            .collect(),
+                    )
+                }
+            }
+        }
+        Ok(debug_overlay)
+    }
+
     /// Add an overlay to the given Dofigen structure to manage OpenFaaS
     fn dofigen_of_overlay(&self, image: dofigen_lib::Image) -> Result<dofigen_lib::Image> {
         log::info!("Adding OpenFaaS overlay to the Dofigen descriptor");
@@ -212,7 +258,15 @@ impl Application {
                     format!("http://127.0.0.1:{}", ports[0]),
                 );
                 envs.insert("suppress_lock".to_string(), "true".to_string());
-
+                if !envs.contains_key("exec_timeout") {
+                    envs.insert("exec_timeout".to_string(), "3600".to_string());
+                }
+                if !envs.contains_key("read_timeout") {
+                    envs.insert("read_timeout".to_string(), "3600".to_string());
+                }
+                if !envs.contains_key("write_timeout") {
+                    envs.insert("write_timeout".to_string(), "3600".to_string());
+                }
                 // handle healthcheck
                 healthcheck = Some(Healthcheck {
                     cmd: "curl --fail http://localhost:8080/_/health".into(),
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 7afa5b1..9efb2e3 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -47,9 +47,10 @@ pub async fn generate_docker_compose(
     dockerfile: PathBuf,
     dev_conf: &Option<Dev>,
     exposed_services: Vec<Service>,
+    debug: bool,
 ) -> Result<()> {
     let compose_content =
-        generate_docker_compose_content(dockerfile, dev_conf, exposed_services).await?;
+        generate_docker_compose_content(dockerfile, dev_conf, exposed_services, debug).await?;
     let compose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
     fs::write(compose_path, compose_content).map_err(Error::from)?;
     Ok(())
@@ -59,6 +60,7 @@ async fn generate_docker_compose_content(
     dockerfile: PathBuf,
     dev_conf: &Option<Dev>,
     exposed_services: Vec<Service>,
+    debug: bool,
 ) -> Result<String> {
     let mut devtool_env_vec: Vec<(String, Option<EnvTypes>)> = vec![
         (
@@ -116,6 +118,21 @@ async fn generate_docker_compose_content(
     ];
 
     let service_images = get_services_images(dev_conf).await;
+    let mut app_ports = vec![];
+    if exposed_services.contains(&Service::App) {
+        app_ports.push(format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT));
+    }
+    if debug {
+        if let Some(conf) = dev_conf {
+            if let Some(dofigen) = &conf.dofigen {
+                if let Some(ports) = &dofigen.ports {
+                    for port in ports {
+                        app_ports.push(format!("{}:{}", port, port));
+                    }
+                }
+            }
+        }
+    }
 
     let compose = Compose {
         services: Some(Services(
@@ -124,7 +141,7 @@ async fn generate_docker_compose_content(
                     APP_SERVICE_NAME.into(),
                     Some(docker_compose_types::Service {
                         image: Some(service_images.app),
-                        ports: if exposed_services.contains(&Service::App) { Some(vec![format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT)])} else {None},
+                        ports: if !app_ports.is_empty() { Some(app_ports)} else {None},
                         build_: Some(BuildStep::Advanced(AdvancedBuildStep {
                             context: "..".into(),
                             dockerfile: Some(dockerfile.to_str().unwrap().into()),

From 3d53c8290421023a08cf4b084279850af6ee01a3 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Fri, 7 Apr 2023 16:34:04 +0200
Subject: [PATCH 60/76] fix: Doc page names

---
 docs-page-builder/build.js      | 4 ++--
 docs/commands/check/template.md | 1 -
 docs/commands/dev/terminal.md   | 2 +-
 docs/config-file.md             | 2 +-
 docs/index.md                   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs-page-builder/build.js b/docs-page-builder/build.js
index 05be2a2..0024564 100644
--- a/docs-page-builder/build.js
+++ b/docs-page-builder/build.js
@@ -42,14 +42,14 @@ async function buildFile(src, filename, destDir) {
         console.log(`buiding ${src} to ${destDir}`);
         const fmResult = fm(await fs.readFile(src, 'utf8'));
         const baseName = filename.replace(/.md$/, "");
-        const title = fmResult.attributes.title ?? (filename === "index.md" ? undefined : baseName);
+        const name = fmResult.attributes.name ?? (filename === "index.md" ? undefined : baseName);
         const destFile = path.join(destDir, `${baseName}.html`);
         const destJsonFile = destFile + '.json';
         return Promise.all([
             fs.writeFile(destFile, converter.makeHtml(fmResult.body), 'utf8'),
             fs.writeFile(destJsonFile, JSON.stringify({
                 ...fmResult.attributes,
-                title,
+                name,
                 sourceFile: githubBasPath + src.replace(/^..\//, '')
             }), 'utf8')
         ]);
diff --git a/docs/commands/check/template.md b/docs/commands/check/template.md
index 86d12dd..98168e7 100644
--- a/docs/commands/check/template.md
+++ b/docs/commands/check/template.md
@@ -1,5 +1,4 @@
 ---
-title: check template
 description: This subcommands checks the running app as a Lenra template app.
 ---
 
diff --git a/docs/commands/dev/terminal.md b/docs/commands/dev/terminal.md
index 44e8b1e..f623ca6 100644
--- a/docs/commands/dev/terminal.md
+++ b/docs/commands/dev/terminal.md
@@ -1,5 +1,5 @@
 ---
-title: Dev terminal
+name: Dev terminal
 description: The dev terminal is a command prompt that let  you run only Lenra specific commands. It has his own history.
 ---
 
diff --git a/docs/config-file.md b/docs/config-file.md
index 15b60be..8022c9e 100644
--- a/docs/config-file.md
+++ b/docs/config-file.md
@@ -1,5 +1,5 @@
 ---
-title: lenra.yml config file
+name: lenra.yml config file
 description: The Lenra's configuration file describes your Lenra app configurations, like API versions or how to build it.
 ---
 
diff --git a/docs/index.md b/docs/index.md
index 4eb4d84..5fca6f6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,5 +1,5 @@
 ---
-title: CLI
+name: CLI
 description: The Lenra's command line interface helps you building your Lenra app locally and it's gona be your best friend !
 ---
 

From 5a63736aeffbbfd049582384a70f2a0791bbe22c Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Fri, 7 Apr 2023 16:37:29 +0200
Subject: [PATCH 61/76] fix: Docs

---
 docs/config-file.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/config-file.md b/docs/config-file.md
index 8022c9e..4fcdfd8 100644
--- a/docs/config-file.md
+++ b/docs/config-file.md
@@ -26,10 +26,8 @@ The configuration is the main element of the file:
 
 The generator define your application is built. There are many configurators:
 
-- [Configuration](#configuration)
-- [Generator](#generator)
-  - [Dofigen](#dofigen)
-  - [Docker](#docker)
+- [Dofigen](#dofigen)
+- [Docker](#docker)
 
 ### Dofigen
 

From c3d203a5d76d839c273aecab35b8873885fa4b1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:21:49 +0200
Subject: [PATCH 62/76] build(deps): bump docker-compose-types from 0.4.0 to
 0.4.1 (#225)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 16 ++++++++--------
 Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 31ebdee..0b1e425 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -272,18 +272,18 @@ dependencies = [
 
 [[package]]
 name = "derive_builder"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
+checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
 dependencies = [
  "derive_builder_macro",
 ]
 
 [[package]]
 name = "derive_builder_core"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
+checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -293,9 +293,9 @@ dependencies = [
 
 [[package]]
 name = "derive_builder_macro"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
+checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
 dependencies = [
  "derive_builder_core",
  "syn 1.0.107",
@@ -344,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "docker-compose-types"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffef37a71a18d9f4b5153f32c5e28bfca03f5f2b87c2821eea1a42097158ce0f"
+checksum = "0ee50caf01e7a34feba906df016260b8850ccc7f5b3cf3a7e7841349af071e8b"
 dependencies = [
  "derive_builder",
  "indexmap",
diff --git a/Cargo.toml b/Cargo.toml
index 143e6e8..0d26196 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ env_logger = "0.10.0"
 regex = "1.7.1"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
-docker-compose-types = "0.4.0"
+docker-compose-types = "0.4.1"
 open = "3"
 rustyline = "10.1.0"
 dirs = "5.0.0"

From 0bf96b78a4bf92110fd7ecb94621df850a593ecd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:08:15 +0200
Subject: [PATCH 63/76] build(deps): bump serde_json from 1.0.91 to 1.0.96
 (#226)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b1e425..6f2a19e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1029,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
 dependencies = [
  "itoa",
  "ryu",

From f3d58d6c6ccda7ecfab3b45d1c30877c7d24f878 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Mon, 17 Apr 2023 11:16:24 +0200
Subject: [PATCH 64/76] Delete FUNDING.yml

---
 .github/FUNDING.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 8a47b7f..0000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: [lenra-io]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From a327c0795a6156d724a76b9444118ce25b421d35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 12:02:25 +0200
Subject: [PATCH 65/76] build(deps): bump thiserror from 1.0.38 to 1.0.40
 (#223)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f2a19e..324364c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1161,22 +1161,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.13",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 0d26196..335ab83 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ open = "3"
 rustyline = "10.1.0"
 dirs = "5.0.0"
 chrono = "0.4.24"
-thiserror = "1.0.37"
+thiserror = "1.0.40"
 colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.27.0", features = ["full"] }

From 5d6d91a59c4a5ad5e79129848b5ad89eb3d86c79 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Tue, 18 Apr 2023 09:32:10 +0200
Subject: [PATCH 66/76] fix: Template clone and upgrade (#222)

---
 src/cli/upgrade.rs | 15 +++++++++++----
 src/git.rs         |  6 +++---
 src/template.rs    |  3 ---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/cli/upgrade.rs b/src/cli/upgrade.rs
index 7ce79f6..99d4398 100644
--- a/src/cli/upgrade.rs
+++ b/src/cli/upgrade.rs
@@ -28,7 +28,7 @@ impl CliCommand for Upgrade {
 
         if git_dir.is_dir() {
             // update the template repo
-            git::fetch(Some(git_dir.clone())).await?;
+            git::pull(Some(git_dir.clone())).await?;
         } else {
             let template_tmp = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_TEMP_DIR);
             // clone template project
@@ -59,17 +59,24 @@ impl CliCommand for Upgrade {
                 .arg("diff")
                 .arg(commit)
                 .arg(current_commit.clone());
-            let patch = get_command_output(cmd).await?;
+            let mut patch = get_command_output(cmd).await?;
+            patch.push('\n');
             fs::write(patch_file.clone(), patch)?;
 
             // apply a patch
             log::debug!("apply patch on project");
             let mut cmd = create_git_command();
             cmd.arg("apply")
-                .arg(patch_file)
+                .arg(patch_file.clone())
                 .stdout(Stdio::inherit())
                 .stderr(Stdio::inherit());
-            cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
+            let patch_file_str = patch_file.to_string_lossy();
+            while !cmd.spawn()?.wait_with_output().await?.status.success() {
+                println!("An error occured applying the patch {patch_file_str}");
+                let mut rl = Editor::<()>::new()?;
+                rl.readline("Fix it and press enter to retry")?;
+            }
+            fs::remove_file(patch_file)?;
         } else {
             // ask for user confirmation
             if !confirm_checkout()? {
diff --git a/src/git.rs b/src/git.rs
index 4ee51ac..c14671d 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -33,15 +33,15 @@ pub async fn get_current_commit(git_dir: Option<PathBuf>) -> Result<String> {
     get_command_output(cmd).await
 }
 
-pub async fn fetch(git_dir: Option<PathBuf>) -> Result<()> {
-    log::debug!("git fetch {:?}", git_dir);
+pub async fn pull(git_dir: Option<PathBuf>) -> Result<()> {
+    log::debug!("git pull {:?}", git_dir);
     let mut cmd = create_git_command();
 
     if let Some(dir) = git_dir {
         cmd.arg("--git-dir").arg(dir.as_os_str());
     }
 
-    cmd.arg("fetch");
+    cmd.arg("pull");
 
     cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
 
diff --git a/src/template.rs b/src/template.rs
index c2eeede..9ef67ff 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -64,9 +64,6 @@ pub async fn clone_template(template: String, target_dir: PathBuf) -> Result<()>
     );
     create_git_command()
         .arg("clone")
-        .arg("--single-branch")
-        .arg("--depth")
-        .arg("1")
         .arg(template)
         .arg(target_dir.as_os_str())
         .spawn()?

From a13b2e840e46f251cc07dfd963106d9f485216c9 Mon Sep 17 00:00:00 2001
From: Alienor-Lenra <102291723+Alienor-Lenra@users.noreply.github.com>
Date: Sat, 22 Apr 2023 15:37:04 +0200
Subject: [PATCH 67/76] Update README.md (#236)

---
 README.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f7b6c7d..bb654b7 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,20 @@
 <h1 align="center">Lenra CLI</h1>
 
   <p align="center">
-    The Lenra's command line interface.
+    Lenra is an open-source and ethical alternative to Firebase. Optimize your app creation, and just like that, make the world a better place;)
+    Create / host and deploy in one place.  
   </p>
-</div>
 
 [Report Bug](https://github.com/lenra-io/lenra_cli/issues)
 ·
 [Request Feature](https://github.com/lenra-io/lenra_cli/issues)
 
+<img width="500" alt="List of avaible language templates" src="https://user-images.githubusercontent.com/102291723/233625967-ba8326ec-14c4-4b86-870c-d7303ae052dc.png">
+</div>
+
+
+
+
 
 The Lenra's command line interface helps you building your Lenra app locally.
 
@@ -38,6 +44,11 @@ Lenra is an open source framework to create your app using any language, and dep
 
 [Discover our framework](https://www.lenra.io/discover.html)
 
+
+<div align="center">
+<img width="500" alt="Capture d’écran 2023-03-21 à 11 24 03" src="https://user-images.githubusercontent.com/102291723/233625939-a4164d38-e754-4104-b5ef-9f61be2381ea.png">
+</div>
+
 <!-- GETTING STARTED -->
 ## Getting Started
 

From 80e5d5ecd77f5797a6210842fb6213fa01a59e52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 11:54:53 +0200
Subject: [PATCH 68/76] build(deps): bump serde from 1.0.159 to 1.0.163 (#262)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 324364c..e3111f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1009,18 +1009,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",

From c4bb390089d2dae3656f1579afa84cc38af5ba2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 14:48:37 +0200
Subject: [PATCH 69/76] build(deps): bump regex from 1.7.1 to 1.8.2 (#265)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 12 ++++++------
 Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e3111f7..7708b8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
 dependencies = [
  "memchr",
 ]
@@ -894,9 +894,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -905,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "ring"
diff --git a/Cargo.toml b/Cargo.toml
index 335ab83..53c13cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ serde_json = "1.0"
 serde_yaml = "0.9.19"
 log = "0.4.17"
 env_logger = "0.10.0"
-regex = "1.7.1"
+regex = "1.8.2"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
 docker-compose-types = "0.4.1"

From 56571bd0ba16b971ca7df2c559ee1c74d728aee2 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Tue, 30 May 2023 14:58:13 +0200
Subject: [PATCH 70/76] feat: Split devtool web and API ports (#267)

---
 Cargo.lock            | 17 -----------------
 Cargo.toml            |  1 -
 src/cli/start.rs      |  2 +-
 src/docker_compose.rs | 19 ++++++++++++-------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7708b8d..7e2fee3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -608,7 +608,6 @@ dependencies = [
  "lazy_static",
  "log",
  "mocktopus",
- "open",
  "regex",
  "rustyline",
  "serde",
@@ -763,16 +762,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
-[[package]]
-name = "open"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
-dependencies = [
- "pathdiff",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "os_str_bytes"
 version = "6.4.1"
@@ -802,12 +791,6 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 53c13cf..861bb06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,6 @@ regex = "1.8.2"
 lazy_static = "1.4.0"
 dofigen = "1.2.0"
 docker-compose-types = "0.4.1"
-open = "3"
 rustyline = "10.1.0"
 dirs = "5.0.0"
 chrono = "0.4.24"
diff --git a/src/cli/start.rs b/src/cli/start.rs
index fc4f713..16018c8 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -43,7 +43,7 @@ impl CliCommand for Start {
         // Open the app
         println!(
             "\nApplication available at http://localhost:{}\n",
-            docker_compose::DEVTOOL_PORT
+            docker_compose::DEVTOOL_WEB_PORT
         );
         Ok(())
     }
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index 9efb2e3..f1e85a7 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -31,7 +31,8 @@ const POSTGRES_IMAGE_TAG: &str = "13";
 const MONGO_IMAGE: &str = "mongo";
 const MONGO_IMAGE_TAG: &str = "5.0.11-focal";
 pub const OF_WATCHDOG_PORT: u16 = 8080;
-pub const DEVTOOL_PORT: u16 = 4000;
+pub const DEVTOOL_WEB_PORT: u16 = 4000;
+pub const DEVTOOL_API_PORT: u16 = 4001;
 pub const MONGO_PORT: u16 = 27017;
 pub const POSTGRES_PORT: u16 = 5432;
 pub const NON_ROOT_USER: &str = "12000";
@@ -94,7 +95,7 @@ async fn generate_docker_compose_content(
         "LENRA_API_URL".into(),
         Some(EnvTypes::String(format!(
             "http://{}:{}",
-            DEVTOOL_SERVICE_NAME, DEVTOOL_PORT
+            DEVTOOL_SERVICE_NAME, DEVTOOL_API_PORT
         ))),
     ));
     devtool_env_vec.push((
@@ -120,14 +121,14 @@ async fn generate_docker_compose_content(
     let service_images = get_services_images(dev_conf).await;
     let mut app_ports = vec![];
     if exposed_services.contains(&Service::App) {
-        app_ports.push(format!("{}:{}", OF_WATCHDOG_PORT, OF_WATCHDOG_PORT));
+        app_ports.push(port_to_port_binding(OF_WATCHDOG_PORT));
     }
     if debug {
         if let Some(conf) = dev_conf {
             if let Some(dofigen) = &conf.dofigen {
                 if let Some(ports) = &dofigen.ports {
                     for port in ports {
-                        app_ports.push(format!("{}:{}", port, port));
+                        app_ports.push(port_to_port_binding(*port));
                     }
                 }
             }
@@ -169,7 +170,7 @@ async fn generate_docker_compose_content(
                     DEVTOOL_SERVICE_NAME.into(),
                     Some(docker_compose_types::Service {
                         image: Some(service_images.devtool),
-                        ports: Some(vec![format!("{}:{}", DEVTOOL_PORT, DEVTOOL_PORT)]),
+                        ports: Some(vec![DEVTOOL_WEB_PORT, DEVTOOL_API_PORT].into_iter().map(port_to_port_binding).collect()),
                         environment: Some(Environment::KvPair(devtool_envs.into())),
                         healthcheck: Some(Healthcheck {
                             test: Some(HealthcheckTest::Multiple(vec![
@@ -207,7 +208,7 @@ async fn generate_docker_compose_content(
                     Some(
                         docker_compose_types::Service {
                             image: Some(service_images.postgres),
-                            ports: if exposed_services.contains(&Service::Postgres) {Some(vec![format!("{}:{}", POSTGRES_PORT, POSTGRES_PORT)])} else {None},
+                            ports: if exposed_services.contains(&Service::Postgres) {Some(vec![port_to_port_binding(POSTGRES_PORT)])} else {None},
                             environment: Some(Environment::KvPair(postgres_envs.into())),
                             healthcheck: Some(Healthcheck {
                                 test: Some(HealthcheckTest::Multiple(vec![
@@ -230,7 +231,7 @@ async fn generate_docker_compose_content(
                     MONGO_SERVICE_NAME.into(),
                     Some( docker_compose_types::Service {
                             image: Some(service_images.mongo),
-                            ports: if exposed_services.contains(&Service::Mongo) {Some(vec![format!("{}:{}", MONGO_PORT, MONGO_PORT)])} else {None},
+                            ports: if exposed_services.contains(&Service::Mongo) {Some(vec![port_to_port_binding(MONGO_PORT)])} else {None},
                             environment: Some(Environment::KvPair(mongo_envs.into())),
                             healthcheck: Some(Healthcheck {
                                 test: Some(HealthcheckTest::Single(r#"test $$(echo "rs.initiate($$CONFIG).ok || rs.status().ok" | mongo --quiet) -eq 1"#.to_string())),
@@ -253,6 +254,10 @@ async fn generate_docker_compose_content(
     serde_yaml::to_string(&compose).map_err(Error::from)
 }
 
+fn port_to_port_binding(port: u16) -> String {
+    format!("{}:{}", port, port)
+}
+
 pub fn create_compose_command() -> process::Command {
     let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
     let mut cmd = process::Command::from(COMPOSE_COMMAND.clone());

From 718cc6cd62acdb1fd33cf2f1671c1475e25e05f2 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Mon, 24 Jul 2023 16:55:16 +0200
Subject: [PATCH 71/76] feat!: Use topics to list Lenra templates en GitHub
 (#295)

---
 Cargo.lock             | 691 +++++++++++++++++++++--------------------
 Cargo.toml             |   2 +
 docs/commands/index.md |   4 +-
 docs/commands/new.md   |  24 +-
 docs/index.md          |   2 +-
 src/cli/mod.rs         |  24 +-
 src/cli/new.rs         | 382 +++++++++++++++++++++--
 src/cli/upgrade.rs     |   8 +-
 src/errors.rs          |   4 +
 src/git.rs             |  20 ++
 src/github.rs          |  56 ++++
 src/main.rs            |  13 +-
 src/template.rs        |  75 ++++-
 13 files changed, 906 insertions(+), 399 deletions(-)
 create mode 100644 src/github.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7e2fee3..51c14d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -10,13 +19,19 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -28,13 +43,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.68"
+version = "0.1.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.26",
 ]
 
 [[package]]
@@ -54,11 +69,26 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
 [[package]]
 name = "bitflags"
@@ -66,23 +96,29 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
 [[package]]
 name = "bumpalo"
-version = "3.11.1"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
 [[package]]
 name = "cfg-if"
@@ -92,13 +128,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "time",
  "wasm-bindgen",
@@ -107,15 +143,15 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.23"
+version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
  "atty",
- "bitflags",
+ "bitflags 1.3.2",
  "clap_derive",
  "clap_lex",
- "indexmap",
+ "indexmap 1.9.3",
  "once_cell",
  "strsim",
  "termcolor",
@@ -124,15 +160,15 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
 dependencies = [
  "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -155,32 +191,22 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "colored"
-version = "2.0.0"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
 dependencies = [
- "atty",
+ "is-terminal",
  "lazy_static",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "crc32fast"
@@ -191,55 +217,11 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "cxx"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
 [[package]]
 name = "darling"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -247,27 +229,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -288,7 +270,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -298,14 +280,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
 dependencies = [
  "derive_builder_core",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "dirs"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
  "dirs-sys",
 ]
@@ -322,13 +304,14 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -349,7 +332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee50caf01e7a34feba906df016260b8850ccc7f5b3cf3a7e7841349af071e8b"
 dependencies = [
  "derive_builder",
- "indexmap",
+ "indexmap 1.9.3",
  "serde",
  "serde_yaml",
 ]
@@ -385,15 +368,21 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "errno"
-version = "0.2.8"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -418,20 +407,20 @@ dependencies = [
 
 [[package]]
 name = "fd-lock"
-version = "3.0.8"
+version = "3.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27"
+checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
 dependencies = [
  "cfg-if",
  "rustix",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -445,35 +434,47 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
@@ -486,12 +487,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "humantime"
@@ -501,26 +499,25 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "winapi",
+ "windows",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -531,9 +528,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -541,48 +538,47 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
  "serde",
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.4"
+name = "indexmap"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
- "libc",
- "windows-sys 0.42.0",
+ "equivalent",
+ "hashbrown 0.14.0",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.2"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.2.6",
- "io-lifetimes",
+ "hermit-abi 0.3.2",
  "rustix",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
 
 [[package]]
 name = "js-sys"
-version = "0.3.60"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -621,30 +617,21 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.139"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -652,12 +639,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "memchr"
@@ -667,23 +651,22 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.5"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -703,7 +686,7 @@ checksum = "3048ef3680533a27f9f8e7d6a0bce44dc61e4895ea0f42709337fa1c8616fefe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -717,24 +700,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
- "bitflags",
+ "autocfg",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "static_assertions",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
 ]
 
 [[package]]
@@ -748,25 +721,40 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.2",
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "os_str_bytes"
-version = "6.4.1"
+version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
 
 [[package]]
 name = "parking_lot"
@@ -780,28 +768,28 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-sys 0.42.0",
+ "windows-targets",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
 
 [[package]]
 name = "proc-macro-error"
@@ -812,7 +800,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -829,18 +817,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
 dependencies = [
  "proc-macro2",
 ]
@@ -861,7 +849,16 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -871,15 +868,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -888,9 +897,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "ring"
@@ -907,45 +916,70 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
 [[package]]
 name = "rustix"
-version = "0.36.6"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
 dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.20.8"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
 dependencies = [
  "log",
  "ring",
+ "rustls-webpki 0.101.1",
  "sct",
- "webpki",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.100.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
+dependencies = [
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
 
 [[package]]
 name = "rustyline"
-version = "10.1.0"
+version = "10.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc2d30f0bb29c4308f902d4a147b2d6cb022b59771463d9785f37e21f544df7"
+checksum = "c1e83c32c3f3c33b08496e0d1df9ea8c64d39adb8eb36a1ebb1440c690697aef"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "clipboard-win",
  "dirs-next",
@@ -964,9 +998,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
 
 [[package]]
 name = "scopeguard"
@@ -974,12 +1008,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -992,29 +1020,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.26",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed"
 dependencies = [
  "itoa",
  "ryu",
@@ -1023,11 +1051,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.19"
+version = "0.9.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10"
+checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
  "itoa",
  "ryu",
  "serde",
@@ -1036,18 +1064,18 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "socket2"
@@ -1065,12 +1093,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
 [[package]]
 name = "str-buf"
 version = "1.0.6"
@@ -1102,14 +1124,14 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1118,9 +1140,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.13"
+version = "2.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1129,9 +1151,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
  "winapi-util",
 ]
@@ -1144,22 +1166,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.26",
 ]
 
 [[package]]
@@ -1184,17 +1206,18 @@ dependencies = [
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
@@ -1204,31 +1227,31 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.26",
 ]
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
@@ -1241,9 +1264,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
@@ -1253,9 +1276,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c"
+checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
 
 [[package]]
 name = "untrusted"
@@ -1265,27 +1288,27 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.6.2"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d"
+checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
 dependencies = [
  "base64",
  "flate2",
  "log",
  "once_cell",
  "rustls",
+ "rustls-webpki 0.100.1",
  "serde",
  "serde_json",
  "url",
- "webpki",
  "webpki-roots",
 ]
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -1294,9 +1317,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "version_check"
@@ -1318,9 +1341,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1328,24 +1351,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.26",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1353,50 +1376,40 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.26",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "web-sys"
-version = "0.3.60"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki-roots"
-version = "0.22.6"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
 dependencies = [
- "webpki",
+ "rustls-webpki 0.100.1",
 ]
 
 [[package]]
@@ -1431,34 +1444,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -1471,42 +1478,42 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
diff --git a/Cargo.toml b/Cargo.toml
index 861bb06..0f7972c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,3 +42,5 @@ strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]
 mocktopus = "0.8.0"
+# assert_cmd = "2.0.11"
+# predicates = "3.0.3"
diff --git a/docs/commands/index.md b/docs/commands/index.md
index b87d6a1..9a03747 100644
--- a/docs/commands/index.md
+++ b/docs/commands/index.md
@@ -4,7 +4,7 @@ description: This CLI contains many subcommands to help you doing what you need.
 
 This CLI contains many subcommands to help you doing what you need.
 
-- [new](./new.md): creates a new Lenra app project
+- [new](./new.md): creates a new Lenra app project from a template
 - [dev](./dev/index.md): starts your app in dev mode
 - [update](./update.md): updates the tools Docker images
 - [upgrade](./upgrade.md): upgrades the app with the last template updates
@@ -34,7 +34,7 @@ SUBCOMMANDS:
     dev        Start the app in an interactive mode
     help       Print this message or the help of the given subcommand(s)
     logs       View output from the containers
-    new        Create a new Lenra app project
+    new        Create a new Lenra app project from a template
     start      Start your app previously built with the build command
     stop       Stop your app previously started with the start command
     update     Update the tools Docker images
diff --git a/docs/commands/new.md b/docs/commands/new.md
index d1e9b9f..9d67ebd 100644
--- a/docs/commands/new.md
+++ b/docs/commands/new.md
@@ -1,27 +1,27 @@
 ---
-description: This subcommand creates a new Lenra app project from a given template and in a given directory.
+description: This subcommand creates a new Lenra app project from a template.
 ---
 
-This subcommand creates a new Lenra app project from a given template and in a given directory.
+This subcommand creates a new Lenra app project from a template.
 The target directory must not exist.
 
 ```bash
 $ lenra new --help
 lenra-new 
-Create a new Lenra app project
+Create a new Lenra app project from a template
 
 USAGE:
-    lenra new <TEMPLATE> [PATH]
+    lenra new [OPTIONS] [TOPICS]...
 
 ARGS:
-    <TEMPLATE>    The project template from which your project will be created. For example,
-                  defining `rust` or `template-rust` will use the next one:
-                  https://github.com/lenra-io/template-rust You can find all our templates at
-                  this url:
-                  https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
-                  You also can set the template project full url to use custom ones
-    <PATH>        The project path [default: .]
+    <TOPICS>...    The project template topics from which your project will be created. For
+                   example, defining `rust` look for the next API endpoint:
+                   https://api.github.com/search/repositories?q=topic:lenra+topic:template+topic:rust&sort=stargazers
+                   You can find all the templates at this url:
+                   https://github.com/search?q=topic%3Alenra+topic%3Atemplate&sort=stargazers&type=repositories
+                   You also can set the template project full url to use custom ones
 
 OPTIONS:
-    -h, --help    Print help information
+    -h, --help           Print help information
+    -p, --path <PATH>    The new project path [default: .]
 ```
diff --git a/docs/index.md b/docs/index.md
index 5fca6f6..c830085 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,7 +18,7 @@ Here are the steps to start building a JavaScript Lenra app:
 
 ```bash
 # new app from javascript template in a new 'my-app' directory
-lenra new javascript my-app
+lenra new javascript -p my-app
 # move to the new app dir
 cd my-app
 # initialize git versionning
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 19ae566..b0b5f80 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -34,7 +34,7 @@ pub trait CliCommand {
 /// The subcommands
 #[derive(Subcommand)]
 pub enum Command {
-    /// Create a new Lenra app project
+    /// Create a new Lenra app project from a template
     New(New),
     /// Build your app in release mode
     Build(Build),
@@ -71,3 +71,25 @@ impl CliCommand for Command {
         .await
     }
 }
+
+#[cfg(test)]
+mod test {
+    use clap::{CommandFactory, FromArgMatches};
+
+    use super::Cli;
+
+    pub fn parse_command_line(line: String) -> Result<Cli, clap::Error> {
+        let args = &mut line.split_whitespace().collect::<Vec<&str>>();
+        let command = <Cli as CommandFactory>::command();
+        let mut matches = command
+            .clone()
+            .try_get_matches_from(args.clone())
+            .map_err(format_error)?;
+        <Cli as FromArgMatches>::from_arg_matches_mut(&mut matches).map_err(format_error)
+    }
+
+    fn format_error(err: clap::Error) -> clap::Error {
+        let mut command = <Cli as CommandFactory>::command();
+        err.format(&mut command)
+    }
+}
diff --git a/src/cli/new.rs b/src/cli/new.rs
index b844a63..01495fb 100644
--- a/src/cli/new.rs
+++ b/src/cli/new.rs
@@ -1,53 +1,397 @@
 //! # new
 //!
-//! The new subcommand creates a new Lenra app project from a given template and into a given path
+//! The new subcommand creates a new Lenra app project from a template
 
 use async_trait::async_trait;
 pub use clap::Args;
 use log;
 use std::fs;
+use std::path::PathBuf;
 
 use crate::cli::CliCommand;
 use crate::config::LENRA_CACHE_DIRECTORY;
 use crate::errors::{Error, Result};
-use crate::git::get_current_commit;
-use crate::template::{clone_template, normalize_template, TEMPLATE_DATA_FILE, TEMPLATE_GIT_DIR};
+use crate::git::{get_current_commit, GIT_REPO_REGEX};
+use crate::template::{
+    choose_repository, clone_template, list_templates, TemplateData, TEMPLATE_DATA_FILE,
+    TEMPLATE_GIT_DIR,
+};
+#[cfg(test)]
+use mocktopus::macros::mockable;
 
 #[derive(Args)]
 pub struct New {
-    /// The project template from which your project will be created.
-    /// For example, defining `rust` or `template-rust` will use the next one: https://github.com/lenra-io/template-rust
-    /// You can find all our templates at this url: https://github.com/orgs/lenra-io/repositories?q=&type=template&language=&sort=stargazers
+    /// The project template topics from which your project will be created.
+    /// For example, defining `rust` look for the next API endpoint: https://api.github.com/search/repositories?q=topic:lenra+topic:template+topic:rust&sort=stargazers
+    /// You can find all the templates at this url: https://github.com/search?q=topic%3Alenra+topic%3Atemplate&sort=stargazers&type=repositories
     /// You also can set the template project full url to use custom ones.
-    pub template: String,
+    pub topics: Vec<String>,
 
-    /// The project path
-    #[clap(parse(from_os_str), default_value = ".")]
+    /// The new project path
+    #[clap(short, long, parse(from_os_str), default_value = ".")]
     path: std::path::PathBuf,
 }
 
 #[async_trait]
 impl CliCommand for New {
     async fn run(&self) -> Result<()> {
-        let template = normalize_template(self.template.clone());
+        log::debug!("topics {:?}", self.topics);
+
+        let template = if self.topics.len() == 1 && GIT_REPO_REGEX.is_match(self.topics[0].as_str())
+        {
+            self.topics[0].clone()
+        } else {
+            let repos = list_templates(&self.topics).await?;
+            if repos.is_empty() {
+                return Err(Error::NoTemplateFound);
+            } else if repos.len() == 1 {
+                repos[0].url.clone()
+            } else {
+                choose_repository(repos).await?.url
+            }
+        };
 
         clone_template(template.clone(), self.path.clone()).await?;
 
         // create `.template` file to save template repo url and commit
         let git_dir = self.path.join(".git");
         let commit = get_current_commit(Some(git_dir.clone())).await?;
-        fs::write(
-            self.path.join(TEMPLATE_DATA_FILE),
-            format!("{}\n{}", template, commit),
-        )
+        TemplateData {
+            template,
+            commit: Some(commit.clone()),
+        }
+        .save_to(&self.path.join(TEMPLATE_DATA_FILE))
+        .await
         .map_err(Error::from)?;
 
-        log::debug!("move git directory");
-        // create the `.lenra` cache directory
-        let cache_dir = self.path.join(LENRA_CACHE_DIRECTORY);
-        fs::create_dir_all(cache_dir.clone()).unwrap();
-        fs::rename(git_dir, cache_dir.join(TEMPLATE_GIT_DIR))?;
+        create_cache_directories(&self.path, &git_dir)?;
+
+        Ok(())
+    }
+}
+
+#[cfg_attr(test, mockable)]
+fn create_cache_directories(path: &PathBuf, git_dir: &PathBuf) -> Result<()> {
+    log::debug!("create cache directories");
+    // create the `.lenra` cache directory
+    let cache_dir = path.join(LENRA_CACHE_DIRECTORY);
+    fs::create_dir_all(cache_dir.clone()).unwrap();
+    // move the template `.git` directory
+    fs::rename(git_dir, cache_dir.join(TEMPLATE_GIT_DIR))?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{rc::Rc, sync::Mutex};
+
+    use mocktopus::mocking::{MockResult, Mockable};
+
+    use super::*;
+    use crate::{
+        cli::{self, Command},
+        git::{self, Repository},
+        template,
+    };
+
+    const NODE_TEMPLATE_HTTP_URL: &str = "https://github.com/lenra-io/template-javascript.git";
+    const NODE_TEMPLATE_SSH_URL: &str = "git@github.com:lenra-io/template-javascript.git";
+    const BUN_TEMPLATE_HTTP_URL: &str = "https://github.com/taorepoara/lenra-template-bun-js.git";
+    const COMMIT_NUMBER: &str = "398416b76fc237291280de3efb719504c43cf563";
+
+    fn mock_all() {
+        template::list_templates.mock_safe(|_| unreachable!());
+        template::clone_template.mock_safe(|_, _| unreachable!());
+        template::choose_repository.mock_safe(|_| unreachable!());
+        git::get_current_commit.mock_safe(|_| unreachable!());
+        TemplateData::save_to.mock_safe(|_, _| unreachable!());
+        create_cache_directories.mock_safe(|_, _| unreachable!());
+    }
+
+    #[tokio::test]
+    async fn no_matching_template() -> Result<(), Box<dyn std::error::Error>> {
+        let cli = cli::test::parse_command_line(String::from("lenra new js"))?;
+        let command = cli.command;
+        let new = match command {
+            Command::New(new) => new,
+            _ => panic!("wrong command"),
+        };
+        let expected_topics = vec!["js".to_string()];
+
+        assert_eq!(new.path, std::path::PathBuf::from("."));
+        assert_eq!(new.topics, expected_topics);
+        mock_all();
+        let list_templates_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&list_templates_call_counter);
+        template::list_templates.mock_safe(move |topics| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            println!("called {} times", *num);
+            assert_eq!(topics, &expected_topics);
+            MockResult::Return(Box::pin(async move { Ok(vec![]) }))
+        });
+        let result = new.run().await;
+        let call_count = *list_templates_call_counter.lock().unwrap();
+        println!("called {} times", call_count);
+        assert_eq!(call_count, 1);
+        assert!(result.is_err());
+        let error = result.unwrap_err();
+        match error {
+            Error::NoTemplateFound => (),
+            er => panic!("wrong error type {er}"),
+        }
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn one_matching_template() -> Result<(), Box<dyn std::error::Error>> {
+        let cli = cli::test::parse_command_line(String::from("lenra new js"))?;
+        let command = cli.command;
+        let new = match command {
+            Command::New(new) => new,
+            _ => panic!("wrong command"),
+        };
+        let expected_topics = vec!["js".to_string()];
+
+        assert_eq!(new.path, std::path::PathBuf::from("."));
+        assert_eq!(new.topics, expected_topics);
+        mock_all();
+        let list_templates_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&list_templates_call_counter);
+        template::list_templates.mock_safe(move |topics| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(topics, &expected_topics);
+            MockResult::Return(Box::pin(async move {
+                Ok(vec![Repository {
+                    name: "template-javascript".to_string(),
+                    description: "Javascript template".to_string(),
+                    url: NODE_TEMPLATE_HTTP_URL.into(),
+                    stars: 0,
+                }])
+            }))
+        });
+        let clone_template_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&clone_template_call_counter);
+        template::clone_template.mock_safe(move |url, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(url, NODE_TEMPLATE_HTTP_URL);
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&get_current_commit_call_counter);
+        git::get_current_commit.mock_safe(move |_| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
+        });
+        let save_to_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&save_to_call_counter);
+        TemplateData::save_to.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_cache_directories_call_counter);
+        create_cache_directories.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Ok(()))
+        });
+        let result = new.run().await;
+        assert_eq!(*list_templates_call_counter.lock().unwrap(), 1);
+        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
+        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
+        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
+        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        assert!(result.is_ok());
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn two_matching_templates() -> Result<(), Box<dyn std::error::Error>> {
+        let cli = cli::test::parse_command_line(String::from("lenra new js"))?;
+        let command = cli.command;
+        let new = match command {
+            Command::New(new) => new,
+            _ => panic!("wrong command"),
+        };
+        let expected_topics = vec!["js".to_string()];
+
+        assert_eq!(new.path, std::path::PathBuf::from("."));
+        assert_eq!(new.topics, expected_topics);
+        mock_all();
+        let list_templates_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&list_templates_call_counter);
+        template::list_templates.mock_safe(move |topics| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(topics, &expected_topics);
+            MockResult::Return(Box::pin(async move {
+                Ok(vec![
+                    Repository {
+                        name: "template-javascript".to_string(),
+                        description: "Javascript template".to_string(),
+                        url: NODE_TEMPLATE_HTTP_URL.into(),
+                        stars: 1,
+                    },
+                    Repository {
+                        name: "template-bun".to_string(),
+                        description: "Javascript template with Bun.sh".to_string(),
+                        url: BUN_TEMPLATE_HTTP_URL.into(),
+                        stars: 0,
+                    },
+                ])
+            }))
+        });
+        let choose_repository_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&choose_repository_call_counter);
+        template::choose_repository.mock_safe(move |repos| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(repos.len(), 2);
+            MockResult::Return(Box::pin(async move { Ok(repos[0].clone()) }))
+        });
+        let clone_template_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&clone_template_call_counter);
+        template::clone_template.mock_safe(move |url, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(url, NODE_TEMPLATE_HTTP_URL);
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&get_current_commit_call_counter);
+        git::get_current_commit.mock_safe(move |_| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
+        });
+        let save_to_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&save_to_call_counter);
+        TemplateData::save_to.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_cache_directories_call_counter);
+        create_cache_directories.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Ok(()))
+        });
+        let result = new.run().await;
+        assert_eq!(*list_templates_call_counter.lock().unwrap(), 1);
+        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
+        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
+        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
+        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        assert!(result.is_ok());
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn from_http_url() -> Result<(), Box<dyn std::error::Error>> {
+        let cli = cli::test::parse_command_line(format!("lenra new {}", NODE_TEMPLATE_HTTP_URL))?;
+        let command = cli.command;
+        let new = match command {
+            Command::New(new) => new,
+            _ => panic!("wrong command"),
+        };
+        let expected_topics = vec![NODE_TEMPLATE_HTTP_URL.to_string()];
+
+        assert_eq!(new.path, std::path::PathBuf::from("."));
+        assert_eq!(new.topics, expected_topics);
+        mock_all();
+        let clone_template_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&clone_template_call_counter);
+        template::clone_template.mock_safe(move |url, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(url, NODE_TEMPLATE_HTTP_URL);
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&get_current_commit_call_counter);
+        git::get_current_commit.mock_safe(move |_| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
+        });
+        let save_to_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&save_to_call_counter);
+        TemplateData::save_to.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_cache_directories_call_counter);
+        create_cache_directories.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Ok(()))
+        });
+        let result = new.run().await;
+        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
+        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
+        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
+        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        assert!(result.is_ok());
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn from_ssh_url() -> Result<(), Box<dyn std::error::Error>> {
+        let cli = cli::test::parse_command_line(format!("lenra new {}", NODE_TEMPLATE_SSH_URL))?;
+        let command = cli.command;
+        let new = match command {
+            Command::New(new) => new,
+            _ => panic!("wrong command"),
+        };
+        let expected_topics = vec![NODE_TEMPLATE_SSH_URL.to_string()];
 
+        assert_eq!(new.path, std::path::PathBuf::from("."));
+        assert_eq!(new.topics, expected_topics);
+        mock_all();
+        let clone_template_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&clone_template_call_counter);
+        template::clone_template.mock_safe(move |url, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            assert_eq!(url, NODE_TEMPLATE_SSH_URL);
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&get_current_commit_call_counter);
+        git::get_current_commit.mock_safe(move |_| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
+        });
+        let save_to_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&save_to_call_counter);
+        TemplateData::save_to.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Box::pin(async move { Ok(()) }))
+        });
+        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_cache_directories_call_counter);
+        create_cache_directories.mock_safe(move |_, _| {
+            let mut num = counter.lock().unwrap();
+            *num += 1;
+            MockResult::Return(Ok(()))
+        });
+        let result = new.run().await;
+        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
+        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
+        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
+        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        assert!(result.is_ok());
         Ok(())
     }
 }
diff --git a/src/cli/upgrade.rs b/src/cli/upgrade.rs
index 99d4398..faa17a8 100644
--- a/src/cli/upgrade.rs
+++ b/src/cli/upgrade.rs
@@ -12,8 +12,7 @@ use crate::config::LENRA_CACHE_DIRECTORY;
 use crate::errors::{Error, Result};
 use crate::git::{self, create_git_command, get_current_commit};
 use crate::template::{
-    clone_template, get_template_data, save_template_data, TemplateData, TEMPLATE_GIT_DIR,
-    TEMPLATE_TEMP_DIR,
+    clone_template, get_template_data, TemplateData, TEMPLATE_GIT_DIR, TEMPLATE_TEMP_DIR,
 };
 
 #[derive(clap::Args)]
@@ -98,10 +97,11 @@ impl CliCommand for Upgrade {
             cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
         }
         // save template data
-        save_template_data(TemplateData {
+        TemplateData {
             template: template_data.template,
             commit: Some(current_commit),
-        })
+        }
+        .save()
         .await
     }
 }
diff --git a/src/errors.rs b/src/errors.rs
index 30b0640..36f31ae 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -30,6 +30,10 @@ pub enum Error {
     FromUtf8(#[from] FromUtf8Error),
     #[error("Check error")]
     Check,
+    #[error("The next GitHub topic is not correct: {0}")]
+    InvalidGitHubTopic(String),
+    #[error("No template found")]
+    NoTemplateFound,
     #[error("{0}")]
     Custom(String),
 }
diff --git a/src/git.rs b/src/git.rs
index c14671d..5453a5b 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -4,11 +4,19 @@ use crate::{
     command::{create_command, get_command_output},
     errors::{Error, Result},
 };
+use lazy_static::lazy_static;
+use regex::Regex;
 use tokio::process;
 
 #[cfg(test)]
 use mocktopus::macros::mockable;
 
+lazy_static! {
+    pub static ref GIT_REPO_REGEX: Regex =
+        Regex::new(r"^((git|ssh|http(s)?)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?$")
+            .unwrap();
+}
+
 pub fn create_git_command() -> process::Command {
     create_command("git")
 }
@@ -47,3 +55,15 @@ pub async fn pull(git_dir: Option<PathBuf>) -> Result<()> {
 
     Ok(())
 }
+
+#[derive(Clone, Debug)]
+pub struct Repository {
+    pub name: String,
+    pub description: String,
+    pub url: String,
+    pub stars: u32,
+}
+
+pub trait PlatformRepository {
+    fn to_repository(&self) -> Repository;
+}
diff --git a/src/github.rs b/src/github.rs
new file mode 100644
index 0000000..ad3c89a
--- /dev/null
+++ b/src/github.rs
@@ -0,0 +1,56 @@
+use lazy_static::lazy_static;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    errors::{Error, Result},
+    git::{PlatformRepository, Repository},
+};
+
+lazy_static! {
+    pub static ref GITHUB_TOPIC_REGEX: Regex = Regex::new(r"^[a-z0-9]+(-[a-z0-9]+)*$").unwrap();
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+struct GitHubSearchRepoResponse {
+    pub total_count: u32,
+    pub items: Vec<GitHubRepository>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+struct GitHubRepository {
+    pub full_name: String,
+    pub description: String,
+    pub clone_url: String,
+    pub stargazers_count: u32,
+}
+
+impl PlatformRepository for GitHubRepository {
+    fn to_repository(&self) -> Repository {
+        Repository {
+            name: self.full_name.clone(),
+            description: self.description.clone(),
+            url: self.clone_url.clone(),
+            stars: self.stargazers_count,
+        }
+    }
+}
+
+pub async fn search_repositories(query: &str) -> Result<Vec<Repository>> {
+    let request = format!(
+        "https://api.github.com/search/repositories?q={}&sort=stars&order=desc",
+        query
+    );
+    log::debug!("search repositories on GitHub: {}", request);
+    let reponse: GitHubSearchRepoResponse = ureq::get(request.as_str())
+        .call()
+        .map_err(Error::from)?
+        .into_json()
+        .map_err(Error::from)?;
+
+    reponse
+        .items
+        .into_iter()
+        .map(|repo| Ok(repo.to_repository()))
+        .collect()
+}
diff --git a/src/main.rs b/src/main.rs
index 919a0b9..1f0a7de 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,6 @@
 use clap::Parser;
 use cli::{Cli, CliCommand};
 use env_logger;
-use errors::Result;
 
 mod cli;
 mod command;
@@ -15,14 +14,20 @@ mod docker;
 mod docker_compose;
 mod errors;
 mod git;
+mod github;
 mod keyboard_event;
 mod matching;
 mod template;
 
-// #![cfg_attr(test, feature(proc_macro_hygiene))]
 #[tokio::main]
-async fn main() -> Result<()> {
+async fn main() -> () {
     env_logger::init();
     let args = Cli::parse();
-    args.command.run().await
+    match args.command.run().await {
+        Ok(_) => (),
+        Err(e) => {
+            println!("{}", e.to_string());
+            std::process::exit(1);
+        }
+    }
 }
diff --git a/src/template.rs b/src/template.rs
index 9ef67ff..dc97368 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -8,16 +8,21 @@ use crate::{
     command::get_command_output,
     config::LENRA_CACHE_DIRECTORY,
     errors::{Error, Result},
-    git::create_git_command,
+    git::{create_git_command, Repository},
+    github::{search_repositories, GITHUB_TOPIC_REGEX},
 };
 use lazy_static::lazy_static;
 use log;
 use regex::Regex;
 use rustyline::Editor;
 
+#[cfg(test)]
+use mocktopus::macros::mockable;
+
 pub const TEMPLATE_DATA_FILE: &str = ".template";
 pub const TEMPLATE_GIT_DIR: &str = "template.git";
 pub const TEMPLATE_TEMP_DIR: &str = "template.tmp";
+pub const RL_CHOOSE_TEMPLATE_MSG: &str = "Which template do you want to use ? ";
 
 lazy_static! {
     static ref TEMPLATE_ALIASES: HashMap<&'static str, &'static str> = vec![
@@ -40,6 +45,20 @@ pub struct TemplateData {
     pub commit: Option<String>,
 }
 
+#[cfg_attr(test, mockable)]
+impl TemplateData {
+    pub async fn save(&self) -> Result<()> {
+        let path = Path::new(TEMPLATE_DATA_FILE);
+        self.save_to(&path).await
+    }
+
+    pub async fn save_to(&self, path: &Path) -> Result<()> {
+        let commit = self.commit.clone().unwrap();
+        log::debug!("save template data {}:{}", self.template, commit);
+        fs::write(path, format!("{}\n{}", self.template, commit)).map_err(Error::from)
+    }
+}
+
 pub fn normalize_template(template: String) -> String {
     if TEMPLATE_SHORT_REGEX.is_match(template.as_str()) {
         // Replace aliases
@@ -56,6 +75,46 @@ pub fn normalize_template(template: String) -> String {
     }
 }
 
+#[cfg_attr(test, mockable)]
+pub async fn list_templates(topics: &Vec<String>) -> Result<Vec<Repository>> {
+    let mut query: String = String::from("topic:lenra+topic:template");
+    for topic in topics {
+        // check topic format
+        if !GITHUB_TOPIC_REGEX.is_match(topic.as_str()) {
+            return Err(Error::InvalidGitHubTopic(topic.clone()));
+        }
+        query.push_str(format!("+topic:{}", topic).as_str());
+    }
+    search_repositories(query.as_str()).await
+}
+
+#[cfg_attr(test, mockable)]
+pub async fn choose_repository(repos: Vec<Repository>) -> Result<Repository> {
+    let mut rl = Editor::<()>::new()?;
+    let mut index = 0;
+    let mut max_index = 0;
+    for repo in &repos {
+        println!(
+            "{:5} {} ({} stars) - {}",
+            format!("[{}]:", index + 1),
+            repo.name,
+            repo.stars,
+            repo.description
+        );
+        index += 1;
+        max_index = index;
+    }
+    let mut choice = rl.readline(RL_CHOOSE_TEMPLATE_MSG)?;
+    while choice.parse::<usize>().is_err()
+        || choice.parse::<usize>().unwrap() < 1
+        || choice.parse::<usize>().unwrap() > max_index
+    {
+        choice = rl.readline(RL_CHOOSE_TEMPLATE_MSG)?;
+    }
+    Ok(repos[choice.parse::<usize>().unwrap() - 1].clone())
+}
+
+#[cfg_attr(test, mockable)]
 pub async fn clone_template(template: String, target_dir: PathBuf) -> Result<()> {
     log::debug!(
         "clone the template {} into {}",
@@ -74,6 +133,7 @@ pub async fn clone_template(template: String, target_dir: PathBuf) -> Result<()>
     Ok(())
 }
 
+#[cfg_attr(test, mockable)]
 pub async fn get_template_data() -> Result<TemplateData> {
     let template_data_file = Path::new(TEMPLATE_DATA_FILE);
     let git_dir = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_GIT_DIR);
@@ -106,16 +166,3 @@ pub async fn get_template_data() -> Result<TemplateData> {
         })
     }
 }
-
-pub async fn save_template_data(template_data: TemplateData) -> Result<()> {
-    let template_data_file = Path::new(TEMPLATE_DATA_FILE);
-    fs::write(
-        template_data_file,
-        format!(
-            "{}\n{}",
-            template_data.template,
-            template_data.commit.unwrap()
-        ),
-    )
-    .map_err(Error::from)
-}

From a24416c530266d94691a6424b7f4a4f64be4f495 Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Tue, 25 Jul 2023 17:51:02 +0200
Subject: [PATCH 72/76] feat!: Commands refactor to make it more user friendly
 (#299)

---
 Cargo.lock                                |  99 ++++----
 Cargo.toml                                |   2 +
 docs/commands/build.md                    |   2 +
 docs/commands/dev.md                      |  35 +++
 docs/commands/dev/continue.md             |  17 --
 docs/commands/dev/index.md                |  25 --
 docs/commands/dev/interactive.md          |  15 --
 docs/commands/dev/reload.md               |  17 --
 docs/commands/dev/terminal.md             |  42 ----
 docs/commands/index.md                    |  23 +-
 docs/commands/logs.md                     |  27 ++-
 docs/commands/new.md                      |   7 +-
 docs/commands/reload.md                   |  20 ++
 docs/commands/start.md                    |   1 +
 docs/commands/stop.md                     |   2 +
 docs/commands/terminal/exit.md            |  17 ++
 docs/commands/{dev => terminal}/expose.md |   4 +-
 docs/commands/terminal/index.md           |  65 ++++++
 docs/commands/update.md                   |   2 +
 docs/commands/upgrade.md                  |   7 +-
 docs/index.md                             |   2 +-
 src/cli/build.rs                          |  48 ++--
 src/cli/check/mod.rs                      |   9 +-
 src/cli/dev/interactive.rs                |  36 +--
 src/cli/dev/mod.rs                        | 111 +++++----
 src/cli/dev/terminal.rs                   | 263 ----------------------
 src/cli/logs.rs                           |   4 +-
 src/cli/mod.rs                            |  84 +++++--
 src/cli/new.rs                            | 255 ++++++---------------
 src/cli/reload.rs                         |  24 ++
 src/cli/start.rs                          |  65 +++---
 src/cli/stop.rs                           |  41 ++--
 src/cli/terminal.rs                       | 201 +++++++++++++++++
 src/cli/update.rs                         |  83 ++-----
 src/cli/upgrade.rs                        | 121 +---------
 src/command.rs                            |  27 ++-
 src/config.rs                             |   4 +-
 src/docker.rs                             |   7 -
 src/docker_compose.rs                     | 246 ++++++++++++++------
 src/errors.rs                             |  10 +
 src/lenra.rs                              | 222 ++++++++++++++++++
 src/main.rs                               |  17 +-
 src/template.rs                           |  15 +-
 43 files changed, 1268 insertions(+), 1056 deletions(-)
 create mode 100644 docs/commands/dev.md
 delete mode 100644 docs/commands/dev/continue.md
 delete mode 100644 docs/commands/dev/index.md
 delete mode 100644 docs/commands/dev/interactive.md
 delete mode 100644 docs/commands/dev/reload.md
 delete mode 100644 docs/commands/dev/terminal.md
 create mode 100644 docs/commands/reload.md
 create mode 100644 docs/commands/terminal/exit.md
 rename docs/commands/{dev => terminal}/expose.md (75%)
 create mode 100644 docs/commands/terminal/index.md
 delete mode 100644 src/cli/dev/terminal.rs
 create mode 100644 src/cli/reload.rs
 create mode 100644 src/cli/terminal.rs
 create mode 100644 src/lenra.rs

diff --git a/Cargo.lock b/Cargo.lock
index 51c14d4..efb0484 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -43,13 +43,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.71"
+version = "0.1.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.26",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -349,6 +349,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
 [[package]]
 name = "endian-type"
 version = "0.1.2"
@@ -568,11 +574,20 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "js-sys"
@@ -601,7 +616,9 @@ dependencies = [
  "docker-compose-types",
  "dofigen",
  "env_logger",
+ "itertools",
  "lazy_static",
+ "loading",
  "log",
  "mocktopus",
  "regex",
@@ -627,6 +644,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
+[[package]]
+name = "loading"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "676420b03272176423578148eee61319e893422694f6d96a394841cb0901357f"
+
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -712,9 +735,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
 ]
@@ -817,18 +840,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.29"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
  "proc-macro2",
 ]
@@ -969,9 +992,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "rustyline"
@@ -998,15 +1021,15 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sct"
@@ -1020,29 +1043,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.171"
+version = "1.0.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.171"
+version = "1.0.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
+checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.26",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
 dependencies = [
  "itoa",
  "ryu",
@@ -1051,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.22"
+version = "0.9.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85"
+checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
 dependencies = [
  "indexmap 2.0.0",
  "itoa",
@@ -1140,9 +1163,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.26"
+version = "2.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1166,22 +1189,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.26",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1238,7 +1261,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.26",
+ "syn 2.0.27",
 ]
 
 [[package]]
@@ -1276,9 +1299,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
 
 [[package]]
 name = "untrusted"
@@ -1360,7 +1383,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.26",
+ "syn 2.0.27",
  "wasm-bindgen-shared",
 ]
 
@@ -1382,7 +1405,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.26",
+ "syn 2.0.27",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 0f7972c..28f95b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,8 @@ ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.27.0", features = ["full"] }
 async-trait = "0.1.68"
 strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
+itertools = "0.11.0"
+loading = "0.3.0"
 
 [dev-dependencies]
 mocktopus = "0.8.0"
diff --git a/docs/commands/build.md b/docs/commands/build.md
index 21d5d88..4b5a7d4 100644
--- a/docs/commands/build.md
+++ b/docs/commands/build.md
@@ -17,4 +17,6 @@ OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
         --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
     -h, --help               Print help information
+        --production         Remove debug access to the app
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/commands/dev.md b/docs/commands/dev.md
new file mode 100644
index 0000000..3e60c01
--- /dev/null
+++ b/docs/commands/dev.md
@@ -0,0 +1,35 @@
+---
+description: This subcommand starts the Lenra app of the current directory in dev mode.
+---
+
+This subcommand starts the Lenra app of the current directory in dev mode.
+
+The dev mode builds and starts the app and then displays its logs.
+
+```bash
+$ lenra dev --help
+lenra-dev 
+Start the app in an interactive mode
+
+USAGE:
+    lenra dev [OPTIONS]
+
+OPTIONS:
+        --attach             Attach the dev mode without rebuilding the app and restarting it
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
+```
+
+When your app is in dev mode, you can run interactive commands through keyboard shortcuts.
+
+Here is the help interactive command result displayed pressing `H` key:
+
+```bash
+SHORTCUTS: (Command  Key(s)  Description)
+    Help      H                Print this message
+    Reload    R                Reload the app by rebuilding and restarting it
+    Quit      Q, Ctrl+C        Quit the interactive mode
+    Stop      S                Stop your app previously started with the start command
+```
diff --git a/docs/commands/dev/continue.md b/docs/commands/dev/continue.md
deleted file mode 100644
index c7a0b8c..0000000
--- a/docs/commands/dev/continue.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-description: This subcommand continues the previous logs command since the last displayed logs.
----
-
-This subcommand continues the previous logs command since the last displayed logs.
-
-```bash
-[lenra]$ continue --help
-lenra-continue 
-Continue the previous logs command since the last displayed logs
-
-USAGE:
-    lenra continue
-
-OPTIONS:
-    -h, --help    Print help information
-```
diff --git a/docs/commands/dev/index.md b/docs/commands/dev/index.md
deleted file mode 100644
index 3600019..0000000
--- a/docs/commands/dev/index.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-description: This subcommand starts the Lenra app of the current directory in dev mode.
----
-
-This subcommand starts the Lenra app of the current directory in dev mode.
-
-The dev mode builds and starts the app and then displays its logs.
-
-```bash
-$ lenra dev --help
-lenra-dev 
-Start the app in an interactive mode
-
-USAGE:
-    lenra dev [OPTIONS]
-
-OPTIONS:
-        --config <CONFIG>    The app configuration file [default: lenra.yml]
-        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
-    -h, --help               Print help information
-    -t, --terminal           Open the dev terminal instead of starting the interactive mode
-```
-
-While displaying logs in dev mode, you can run some [interactive commands](./interactive.md) by pressing the good keys.
-You also can press `Ctrl + C` to start our [dev terminal](./terminal.md).
diff --git a/docs/commands/dev/interactive.md b/docs/commands/dev/interactive.md
deleted file mode 100644
index b96ba62..0000000
--- a/docs/commands/dev/interactive.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-description: Run interactive commands through keyboard shortcuts.
----
-
-When displaying logs in dev mode with the follow option (with [`lenra dev`](../dev.md)), you can run interactive commands through keyboard shortcuts.
-
-Here is the help interactive command result displayed pressing `H` key:
-
-```
-SHORTCUTS: (Command  Key(s)  Description)
-    Help      H                Print this message
-    Reload    R                Reload the app by rebuilding and restarting it
-    Quit      Q, Ctrl+C        Quit the interactive mode and open the Lenra dev terminal
-    Stop      S                Stop your app and the local Lenra environment
-```
\ No newline at end of file
diff --git a/docs/commands/dev/reload.md b/docs/commands/dev/reload.md
deleted file mode 100644
index b382201..0000000
--- a/docs/commands/dev/reload.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-description: This subcommand reloads the app by rebuilding and restarting it.
----
-
-This subcommand reloads the app by rebuilding and restarting it.
-
-```bash
-[lenra]$ reload --help
-lenra-reload 
-Reload the app by rebuilding and restarting it
-
-USAGE:
-    lenra reload
-
-OPTIONS:
-    -h, --help    Print help information
-```
diff --git a/docs/commands/dev/terminal.md b/docs/commands/dev/terminal.md
deleted file mode 100644
index f623ca6..0000000
--- a/docs/commands/dev/terminal.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-name: Dev terminal
-description: The dev terminal is a command prompt that let  you run only Lenra specific commands. It has his own history.
----
-
-The dev terminal is a command prompt that let  you run only Lenra specific commands. It has his own history.
-
-Here is the `help` command result of the dev terminal:
-
-```bash
-[lenra]$ help
-lenra_cli 
-The Lenra interactive command line interface
-
-USAGE:
-    lenra <SUBCOMMAND>
-
-OPTIONS:
-    -h, --help    Print help information
-
-SUBCOMMANDS:
-    check       Checks the running app
-    continue    Continue the previous logs command since the last displayed logs
-    exit        stop alias. Stop your app previously started with the start command
-    expose      Exposes the app ports
-    help        Print this message or the help of the given subcommand(s)
-    logs        View output from the containers
-    reload      Reload the app by rebuilding and restarting it
-    stop        Stop your app previously started with the start command
-```
-
-## Subcommands
-
-This tools contains many subcommands to help you do what you need.
-
-- [continue](./continue.md): continues the previous logs command since the last displayed logs
-- [reload](./reload.md): reloads the app by rebuilding and restarting it
-- [stop](../stop.md): stops your app previously started with the start command
-- [exit](../stop.md): `stop` alias
-- [expose](./expose.md): exposes the app ports
-- [logs](../logs.md): displays output from the containers
-- [check](../check/index.md): checks the running app
\ No newline at end of file
diff --git a/docs/commands/index.md b/docs/commands/index.md
index 9a03747..39c9242 100644
--- a/docs/commands/index.md
+++ b/docs/commands/index.md
@@ -10,6 +10,7 @@ This CLI contains many subcommands to help you doing what you need.
 - [upgrade](./upgrade.md): upgrades the app with the last template updates
 - [build](./build.md): builds the Lenra app of the current directory
 - [start](./start.md): starts your app previously built with the build command
+- [reload](./reload.md): starts your app previously built with the build command
 - [logs](./logs.md): displays output from the containers
 - [stop](./stop.md): stops your app previously started with the start command
 - [check](./check/index.md): checks the running app
@@ -22,11 +23,14 @@ lenra_cli 0.0.0
 The Lenra command line interface
 
 USAGE:
-    lenra <SUBCOMMAND>
+    lenra [OPTIONS] [SUBCOMMAND]
 
 OPTIONS:
-    -h, --help       Print help information
-    -V, --version    Print version information
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
+    -V, --version            Print version information
 
 SUBCOMMANDS:
     build      Build your app in release mode
@@ -35,8 +39,21 @@ SUBCOMMANDS:
     help       Print this message or the help of the given subcommand(s)
     logs       View output from the containers
     new        Create a new Lenra app project from a template
+    reload     Reload the app by rebuilding and restarting it
     start      Start your app previously built with the build command
     stop       Stop your app previously started with the start command
     update     Update the tools Docker images
     upgrade    Upgrade the app with the last template updates
 ```
+
+Some global options are available for all subcommands:
+
+```bash
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -v, --verbose            Run the commands as verbose
+```
+
+They won't have effect on all subcommands but can be used for most of them.
+Also, you will be able to set them in the [terminal context](./terminal/index.md) since they are defined for the whole terminal lifetime (except the `--expose` option that can be redefined by the [`expose` command](./terminal/expose.md)).
diff --git a/docs/commands/logs.md b/docs/commands/logs.md
index d221941..a18981d 100644
--- a/docs/commands/logs.md
+++ b/docs/commands/logs.md
@@ -14,18 +14,21 @@ USAGE:
 
 ARGS:
     <SERVICES>...    The logged service list [default: app] [possible values: app, devtool,
-                     postgres]
+                     postgres, mongo]
 
 OPTIONS:
-    -f, --follow           Follow log output
-    -h, --help             Print help information
-        --no-color         Produce monochrome output
-        --no-log-prefix    Don't print prefix in logs
-        --since <SINCE>    Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g.
-                           42m for 42 minutes)
-    -t, --timestamps       Show timestamps
-        --tail <TAIL>      Number of lines to show from the end of the logs for each container
-                           [default: all]
-        --until <UNTIL>    Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative
-                           (e.g. 42m for 42 minutes)
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -f, --follow             Follow log output
+    -h, --help               Print help information
+        --no-color           Produce monochrome output
+        --no-log-prefix      Don't print prefix in logs
+        --since <SINCE>      Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g.
+                             42m for 42 minutes)
+    -t, --timestamps         Show timestamps
+        --tail <TAIL>        Number of lines to show from the end of the logs for each container
+                             [default: all]
+        --until <UNTIL>      Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative
+                             (e.g. 42m for 42 minutes)
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/commands/new.md b/docs/commands/new.md
index 9d67ebd..ed1f11e 100644
--- a/docs/commands/new.md
+++ b/docs/commands/new.md
@@ -22,6 +22,9 @@ ARGS:
                    You also can set the template project full url to use custom ones
 
 OPTIONS:
-    -h, --help           Print help information
-    -p, --path <PATH>    The new project path [default: .]
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+    -p, --path <PATH>        The new project path [default: .]
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/commands/reload.md b/docs/commands/reload.md
new file mode 100644
index 0000000..1831e74
--- /dev/null
+++ b/docs/commands/reload.md
@@ -0,0 +1,20 @@
+---
+description: This subcommand reloads the app by rebuilding and restarting it.
+---
+
+This subcommand reloads the app by rebuilding and restarting it.
+
+```bash
+$ lenra reload --help
+lenra-reload 
+Reload the app by rebuilding and restarting it
+
+USAGE:
+    lenra reload [OPTIONS]
+
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
+```
diff --git a/docs/commands/start.md b/docs/commands/start.md
index 016b143..01902a0 100644
--- a/docs/commands/start.md
+++ b/docs/commands/start.md
@@ -16,4 +16,5 @@ OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
         --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
     -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/commands/stop.md b/docs/commands/stop.md
index f0f6ef4..000be2e 100644
--- a/docs/commands/stop.md
+++ b/docs/commands/stop.md
@@ -14,5 +14,7 @@ USAGE:
 
 OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
     -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/commands/terminal/exit.md b/docs/commands/terminal/exit.md
new file mode 100644
index 0000000..d880b54
--- /dev/null
+++ b/docs/commands/terminal/exit.md
@@ -0,0 +1,17 @@
+---
+description: This command let you exit from the terminal.
+---
+
+This command let you exit from the terminal. You also can use the `Ctrl + C` and `Ctrl + D` shortcuts.
+
+```bash
+[lenra]$ exit --help
+lenra-exit 
+Exits the terminal
+
+USAGE:
+    lenra exit
+
+OPTIONS:
+    -h, --help    Print help information
+```
diff --git a/docs/commands/dev/expose.md b/docs/commands/terminal/expose.md
similarity index 75%
rename from docs/commands/dev/expose.md
rename to docs/commands/terminal/expose.md
index 6d2f089..5a8598e 100644
--- a/docs/commands/dev/expose.md
+++ b/docs/commands/terminal/expose.md
@@ -1,8 +1,8 @@
 ---
-description: This subcommand exposes the containers ports.
+description: This command exposes the containers ports.
 ---
 
-This subcommand exposes the containers ports.
+This command exposes the containers ports.
 
 ```bash
 [lenra]$ expose --help
diff --git a/docs/commands/terminal/index.md b/docs/commands/terminal/index.md
new file mode 100644
index 0000000..98266fe
--- /dev/null
+++ b/docs/commands/terminal/index.md
@@ -0,0 +1,65 @@
+---
+description: The terminal is a command prompt that let you run only Lenra specific commands. It has his own history and keep the same command context during it lifetime.
+---
+
+The terminal is a command prompt that let you run only Lenra specific commands. It has his own history and keep the same command context during it lifetime.
+
+To start the terminal, run the `lenra` command without any subcommand:
+
+```bash
+$ lenra
+```
+
+You can use the global options to configure the terminal context:
+
+```bash
+OPTIONS:
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -v, --verbose            Run the commands as verbose
+```
+
+## Commands
+
+The terminal let run all the `lenra` subcommands (excpet the `terminal` itself and the `new` one) without the need of write `lenra` before them each time and even more:
+
+
+- [dev](../dev.md): starts your app in dev mode
+- [update](../update.md): updates the tools Docker images
+- [upgrade](../upgrade.md): upgrades the app with the last template updates
+- [build](../build.md): builds the Lenra app of the current directory
+- [start](../start.md): starts your app previously built with the build command
+- [reload](../reload.md): starts your app previously built with the build command
+- [logs](../logs.md): displays output from the containers
+- [stop](../stop.md): stops your app previously started with the start command
+- [check](../check/index.md): checks the running app
+- [expose](./expose.md): exposes the services ports and keep it in the terminal context
+- [exit](./exit.md): exits the terminal
+
+Here is the help result in the terminal:
+
+```bash
+[lenra]$ help
+lenra_cli 
+The Lenra interactive command line interface
+
+USAGE:
+    lenra <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    build      Build your app in release mode
+    check      Checks the running app
+    dev        Start the app in an interactive mode
+    exit       Exits the terminal
+    expose     Exposes the app ports
+    help       Print this message or the help of the given subcommand(s)
+    logs       View output from the containers
+    reload     Reload the app by rebuilding and restarting it
+    start      Start your app previously built with the build command
+    stop       Stop your app previously started with the start command
+    update     Update the tools Docker images
+    upgrade    Upgrade the app with the last template updates
+```
diff --git a/docs/commands/update.md b/docs/commands/update.md
index d185db2..3c9dcad 100644
--- a/docs/commands/update.md
+++ b/docs/commands/update.md
@@ -18,5 +18,7 @@ ARGS:
 
 OPTIONS:
         --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
     -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/commands/upgrade.md b/docs/commands/upgrade.md
index d59d20f..7257c21 100644
--- a/docs/commands/upgrade.md
+++ b/docs/commands/upgrade.md
@@ -10,8 +10,11 @@ lenra-upgrade
 Upgrade the app with the last template updates
 
 USAGE:
-    lenra upgrade
+    lenra upgrade [OPTIONS]
 
 OPTIONS:
-    -h, --help    Print help information
+        --config <CONFIG>    The app configuration file [default: lenra.yml]
+        --expose <EXPOSE>    Exposes services ports [possible values: app, devtool, postgres, mongo]
+    -h, --help               Print help information
+    -v, --verbose            Run the commands as verbose
 ```
diff --git a/docs/index.md b/docs/index.md
index c830085..1bfee7a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -27,7 +27,7 @@ git init
 lenra dev
 ```
 
-Look the [`lenra dev` subcommand](commands/dev/index.md) to understand the new dev mode and terminal.
+Look the [`lenra dev` subcommand](commands/dev/index.md) to understand the new dev mode.
 
 ## Configure your app container
 
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 3972ec9..88d0f0d 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -1,23 +1,15 @@
 use async_trait::async_trait;
-use log;
 
 use clap;
 
 use crate::cli::CliCommand;
-use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
-use crate::docker_compose::{compose_build, Service};
 use crate::errors::Result;
+use crate::lenra;
 
-#[derive(clap::Args, Default)]
-pub struct Build {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-
-    /// Exposes services ports.
-    #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
-    pub expose: Vec<Service>,
+use super::{loader, CommandContext};
 
+#[derive(clap::Args, Default, Debug, Clone)]
+pub struct Build {
     /// Remove debug access to the app.
     #[clap(long, alias = "prod", action)]
     pub production: bool,
@@ -25,16 +17,28 @@ pub struct Build {
 
 #[async_trait]
 impl CliCommand for Build {
-    async fn run(&self) -> Result<()> {
-        let conf = load_config_file(&self.config)?;
-        // TODO: check the components API version
+    async fn run(&self, context: CommandContext) -> Result<()> {
+        generate_app_env_loader(context, self.production).await?;
+        build_loader().await
+    }
+}
 
-        conf.generate_files(self.expose.clone(), !self.production)
-            .await?;
+pub async fn generate_app_env_loader(context: CommandContext, production: bool) -> Result<()> {
+    loader(
+        "Generate app env...",
+        "App env generated",
+        "Failed generating app env",
+        || async { lenra::generate_app_env(&context.config, &context.expose, production).await },
+    )
+    .await
+}
 
-        log::info!("Build the Docker image");
-        compose_build().await?;
-        log::info!("Image built");
-        Ok(())
-    }
+pub async fn build_loader() -> Result<()> {
+    loader(
+        "Build app...",
+        "App built",
+        "Failed building app",
+        || async { lenra::build_app().await },
+    )
+    .await
 }
diff --git a/src/cli/check/mod.rs b/src/cli/check/mod.rs
index 6101b09..31cd689 100644
--- a/src/cli/check/mod.rs
+++ b/src/cli/check/mod.rs
@@ -7,13 +7,14 @@ use log::{debug, info};
 use serde_json::Value;
 
 use crate::{
+    docker_compose::{get_service_published_ports, Service},
     errors::{Error, Result},
     matching::{Matching, MatchingErrorType},
 };
 
 use self::template::TemplateChecker;
 
-use super::CliCommand;
+use super::{CliCommand, CommandContext};
 
 mod template;
 
@@ -37,7 +38,11 @@ pub enum CheckCommandType {
 
 #[async_trait]
 impl CliCommand for Check {
-    async fn run(&self) -> Result<()> {
+    async fn run(&self, _context: CommandContext) -> Result<()> {
+        // check that the app service is exposed
+        if get_service_published_ports(Service::App).await?.is_empty() {
+            return Err(Error::ServiceNotExposed(Service::App));
+        }
         match self.command.clone() {
             CheckCommandType::Template(params) => {
                 let template_checker = TemplateChecker;
diff --git a/src/cli/dev/interactive.rs b/src/cli/dev/interactive.rs
index d27fa10..5a96a75 100644
--- a/src/cli/dev/interactive.rs
+++ b/src/cli/dev/interactive.rs
@@ -1,5 +1,9 @@
-use super::terminal::{DevCli, DevTermCommand};
 use crate::{
+    cli::{
+        reload::Reload,
+        stop::Stop,
+        terminal::{TerminalCli, TerminalCommand},
+    },
     errors::Result,
     keyboard_event::{keyevent_to_string, KeyEventListener, KeyboardListener},
 };
@@ -17,7 +21,7 @@ const ENTER_EVENT: KeyEvent = KeyEvent(KeyCode::Enter, Modifiers::NONE);
 pub trait KeyboardShorcut<T> {
     fn about(&self) -> String;
     fn events(&self) -> Vec<KeyEvent>;
-    fn run(&self) -> Option<T>;
+    fn to_value(&self) -> Option<T>;
 }
 
 #[derive(EnumIter, Display, Debug, PartialEq, Clone)]
@@ -34,15 +38,13 @@ impl InteractiveCommand {
     }
 }
 
-impl KeyboardShorcut<DevTermCommand> for InteractiveCommand {
+impl KeyboardShorcut<TerminalCommand> for InteractiveCommand {
     fn about(&self) -> String {
         match self {
             InteractiveCommand::Help => "Print this message".into(),
-            InteractiveCommand::Quit => {
-                "Quit the interactive mode and open the Lenra dev terminal".into()
-            }
+            InteractiveCommand::Quit => "Quit the interactive mode".into(),
             _ => {
-                let main_command = DevCli::command();
+                let main_command = TerminalCli::command();
                 let command = main_command.find_subcommand(self.name().to_lowercase().as_str());
                 command.unwrap().get_about().unwrap().into()
             }
@@ -65,21 +67,24 @@ impl KeyboardShorcut<DevTermCommand> for InteractiveCommand {
         }
     }
 
-    fn run(&self) -> Option<DevTermCommand> {
+    fn to_value(&self) -> Option<TerminalCommand> {
         match self {
             InteractiveCommand::Help => {
                 display_help();
-                Some(DevTermCommand::Continue)
+                None
             }
-            InteractiveCommand::Reload => Some(DevTermCommand::Reload),
-            InteractiveCommand::Quit => None,
-            InteractiveCommand::Stop => Some(DevTermCommand::Stop),
+            InteractiveCommand::Reload => Some(TerminalCommand::Reload(Reload {
+                ..Default::default()
+            })),
+            InteractiveCommand::Quit => Some(TerminalCommand::Exit),
+            InteractiveCommand::Stop => Some(TerminalCommand::Stop(Stop)),
         }
     }
 }
 
-pub async fn listen_interactive_command() -> Result<Option<DevTermCommand>> {
-    let command: Arc<Mutex<Option<DevTermCommand>>> = Arc::new(Mutex::new(None));
+pub async fn listen_interactive_command() -> Result<Option<TerminalCommand>> {
+    debug!("Listen interactive command");
+    let command: Arc<Mutex<Option<TerminalCommand>>> = Arc::new(Mutex::new(None));
     let mut listener = KeyboardListener::new()?;
     InteractiveCommand::iter().for_each(|cmd| {
         cmd.events().iter().for_each(|&event| {
@@ -87,7 +92,7 @@ pub async fn listen_interactive_command() -> Result<Option<DevTermCommand>> {
             let local_command = command.clone();
             let f = move || {
                 let mut c = local_command.lock().unwrap();
-                *c = cmd.run();
+                *c = cmd.to_value();
                 debug!("{}", cmd.name());
                 Some(Cmd::AcceptLine)
             };
@@ -101,6 +106,7 @@ pub async fn listen_interactive_command() -> Result<Option<DevTermCommand>> {
     listener.listen().await?;
     let mutex = command.lock().unwrap();
     let command = mutex.deref();
+    debug!("Interactive command: {:?}", command);
     Ok(command.clone())
 }
 
diff --git a/src/cli/dev/mod.rs b/src/cli/dev/mod.rs
index 9197dae..d60c556 100644
--- a/src/cli/dev/mod.rs
+++ b/src/cli/dev/mod.rs
@@ -1,68 +1,93 @@
 use async_trait::async_trait;
+use chrono::{DateTime, SecondsFormat, Utc};
 pub use clap::Args;
+use tokio::select;
 
-use crate::cli::build::Build;
-use crate::cli::dev::terminal::{run_dev_terminal, DevTermContext};
-use crate::cli::start::Start;
-use crate::cli::stop::Stop;
-use crate::cli::CliCommand;
-use crate::config::DEFAULT_CONFIG_FILE;
 use crate::docker_compose::Service;
 use crate::errors::Result;
+use crate::{
+    cli::{
+        build,
+        dev::interactive::listen_interactive_command,
+        logs::Logs,
+        start,
+        terminal::{run_command, TerminalCommand},
+        CliCommand, CommandContext,
+    },
+    lenra,
+};
+
+use interactive::{InteractiveCommand, KeyboardShorcut};
 
 mod interactive;
-mod terminal;
 
-#[derive(Args)]
+#[derive(Args, Debug, Clone)]
 pub struct Dev {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
-
-    /// Open the dev terminal instead of starting the interactive mode
-    #[clap(short, long, action)]
-    pub terminal: bool,
-
-    /// Exposes services ports.
-    #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
-    pub expose: Vec<Service>,
+    /// Attach the dev mode without rebuilding the app and restarting it.
+    #[clap(long, action)]
+    pub attach: bool,
 }
 
 #[async_trait]
 impl CliCommand for Dev {
-    async fn run(&self) -> Result<()> {
+    async fn run(&self, context: CommandContext) -> Result<()> {
         log::info!("Run dev mode");
 
-        let build = Build {
-            config: self.config.clone(),
-            expose: self.expose.clone(),
-            ..Default::default()
-        };
-        log::debug!("Run build");
-        build.run().await?;
+        if !self.attach {
+            build::generate_app_env_loader(context.clone(), false).await?;
+            build::build_loader().await?;
+            start::start_loader().await?;
+            start::clear_cache_loader().await?;
+        }
 
-        let start = Start {
-            config: self.config.clone(),
-            expose: self.expose.clone(),
+        let previous_log = Logs {
+            services: vec![Service::App],
+            follow: true,
             ..Default::default()
         };
-        log::debug!("Run start");
-        start.run().await?;
+        let mut last_logs: Option<DateTime<Utc>> = None;
 
-        run_dev_terminal(
-            &DevTermContext {
-                config: self.config.clone(),
-                expose: self.expose.clone(),
-            },
-            self.terminal,
-        )
-        .await?;
+        let mut cmd_context = context;
 
-        let stop = Stop;
-        log::debug!("Run stop");
-        stop.run().await?;
+        lenra::display_app_access_url();
+        InteractiveCommand::Help.to_value();
+        let mut interactive_cmd = None;
+        loop {
+            if let Some(command) = interactive_cmd {
+                let (ctx_opt, keep_running) = run_command(&command, cmd_context.clone()).await;
+                if !keep_running {
+                    break;
+                }
+                if let Some(ctx) = ctx_opt {
+                    cmd_context = ctx.clone();
+                }
+            }
+            let end_date;
+            (end_date, interactive_cmd) =
+                run_logs(&previous_log, last_logs, cmd_context.clone()).await?;
+            last_logs = Some(end_date);
+        }
 
         log::debug!("End of dev mode");
         Ok(())
     }
 }
+
+async fn run_logs(
+    logs: &Logs,
+    last_end: Option<DateTime<Utc>>,
+    context: CommandContext,
+) -> Result<(DateTime<Utc>, Option<TerminalCommand>)> {
+    let mut clone = logs.clone();
+    if let Some(last_logs) = last_end {
+        // Only displays new logs
+        clone.since = Some(last_logs.to_rfc3339_opts(SecondsFormat::Secs, true));
+    }
+
+    let command = select! {
+        res = listen_interactive_command() => {res?}
+        res = clone.run(context) => {res?; None}
+        // res = tokio::signal::ctrl_c() => {res?; None}
+    };
+    Ok((Utc::now(), command))
+}
diff --git a/src/cli/dev/terminal.rs b/src/cli/dev/terminal.rs
deleted file mode 100644
index 009b589..0000000
--- a/src/cli/dev/terminal.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-use std::fs;
-
-use crate::cli::dev::interactive::listen_interactive_command;
-use chrono::{DateTime, SecondsFormat, Utc};
-pub use clap::{Args, Parser, Subcommand};
-use clap::{CommandFactory, FromArgMatches};
-use dirs::config_dir;
-use log::{debug, warn};
-use rustyline::{error::ReadlineError, Editor};
-use tokio::select;
-
-use crate::{
-    config::load_config_file,
-    devtool::stop_app_env,
-    docker_compose::{compose_build, compose_up, Service},
-    errors::{Error, Result},
-};
-
-use crate::cli::{check::Check, logs::Logs, CliCommand};
-
-use super::interactive::{InteractiveCommand, KeyboardShorcut};
-
-const LENRA_COMMAND: &str = "lenra";
-const READLINE_PROMPT: &str = "[lenra]$ ";
-// const ESCAPE_EVENT: KeyEvent = KeyEvent(KeyCode::Esc, Modifiers::NONE);
-
-pub async fn run_dev_terminal(initial_context: &DevTermContext, terminal: bool) -> Result<()> {
-    let history_path = config_dir()
-        .ok_or(Error::Custom("Can't get the user config directory".into()))?
-        .join("lenra")
-        .join("dev.history");
-    let mut rl = Editor::<()>::new()?;
-
-    debug!("Load history from {:?}", history_path);
-    if rl.load_history(&history_path).is_err() {
-        debug!("No previous history.");
-    }
-
-    let mut previous_log = Logs {
-        services: vec![Service::App],
-        follow: true,
-        ..Default::default()
-    };
-    let mut last_logs = Utc::now();
-    let mut interactive_cmd = if !terminal {
-        InteractiveCommand::Help.run();
-        Some(DevTermCommand::Logs(previous_log.clone()))
-    } else {
-        None
-    };
-    let mut context = initial_context.clone();
-
-    loop {
-        let command = if let Some(cmd) = interactive_cmd {
-            interactive_cmd = match cmd {
-                DevTermCommand::Reload => Some(DevTermCommand::Continue),
-                _ => None,
-            };
-            cmd
-        } else {
-            let readline = rl.readline(READLINE_PROMPT);
-            match readline {
-                Ok(line) => {
-                    if line.trim().is_empty() {
-                        continue;
-                    }
-
-                    rl.add_history_entry(line.as_str());
-
-                    let parse_result = parse_command_line(line.clone()).map_err(Error::from);
-                    match parse_result {
-                        Ok(dev_cli) => dev_cli.command,
-                        Err(Error::ParseCommand(clap_error)) => {
-                            clap_error.print().ok();
-                            continue;
-                        }
-                        Err(err) => {
-                            debug!("Parse command error: {}", err);
-                            warn!("not a valid command {}", line);
-                            continue;
-                        }
-                    }
-                }
-                Err(ReadlineError::Interrupted) => {
-                    debug!("CTRL-C");
-                    break;
-                }
-                Err(ReadlineError::Eof) => {
-                    debug!("CTRL-D");
-                    break;
-                }
-                Err(err) => {
-                    println!("Error: {:?}", err);
-                    break;
-                }
-            }
-        };
-
-        debug!("Run command {:#?}", command);
-        match command {
-            DevTermCommand::Continue => {
-                (last_logs, interactive_cmd) = run_logs(&previous_log, Some(last_logs)).await?;
-            }
-            DevTermCommand::Logs(logs) => match logs {
-                Logs { follow: true, .. } => {
-                    previous_log = logs.clone();
-                    (last_logs, interactive_cmd) = run_logs(&previous_log, None).await?;
-                }
-                _ => {
-                    logs.run().await?;
-                }
-            },
-            DevTermCommand::Stop | DevTermCommand::Exit => break,
-            cmd => {
-                let ctx = context.clone();
-                match cmd.run(&ctx).await {
-                    Ok(ctx_opt) => {
-                        if let Some(ctx) = ctx_opt {
-                            context = ctx.clone();
-                        }
-                    }
-                    Err(error) => eprintln!("{}", error),
-                }
-            }
-        }
-    }
-    debug!("Save history to {:?}", history_path);
-    fs::create_dir_all(history_path.parent().unwrap())?;
-    rl.save_history(&history_path).map_err(Error::from)
-}
-
-async fn run_logs(
-    logs: &Logs,
-    last_end: Option<DateTime<Utc>>,
-) -> Result<(DateTime<Utc>, Option<DevTermCommand>)> {
-    let mut clone = logs.clone();
-    if let Some(last_logs) = last_end {
-        // Only displays new logs
-        clone.since = Some(last_logs.to_rfc3339_opts(SecondsFormat::Secs, true));
-    }
-
-    let command = select! {
-        res = listen_interactive_command() => {res?}
-        res = clone.run() => {res?; None}
-        // res = tokio::signal::ctrl_c() => {res?; None}
-    };
-    Ok((Utc::now(), command))
-}
-
-fn parse_command_line(line: String) -> Result<DevCli, clap::Error> {
-    let args = &mut line.split_whitespace().collect::<Vec<&str>>();
-
-    let first_arg = if args.len() > 0 { Some(args[0]) } else { None };
-    if let Some(arg) = first_arg {
-        if LENRA_COMMAND != arg {
-            args.push(LENRA_COMMAND);
-            args.rotate_right(1);
-        }
-    }
-    debug!("Try to parse dev terminal command: {:?}", args);
-
-    let command = <DevCli as CommandFactory>::command();
-    let mut matches = command
-        .clone()
-        .try_get_matches_from(args.clone())
-        .map_err(format_error)?;
-    <DevCli as FromArgMatches>::from_arg_matches_mut(&mut matches).map_err(format_error)
-}
-
-fn format_error(err: clap::Error) -> clap::Error {
-    let mut command = <DevCli as CommandFactory>::command();
-    err.format(&mut command)
-}
-
-#[derive(Clone, Debug)]
-pub struct DevTermContext {
-    /// The app configuration file.
-    pub config: std::path::PathBuf,
-
-    /// Exposes all services ports.
-    pub expose: Vec<Service>,
-}
-
-/// The Lenra interactive command line interface
-#[derive(Parser, Debug, Clone)]
-#[clap(rename_all = "kebab-case")]
-pub struct DevCli {
-    #[clap(subcommand)]
-    pub command: DevTermCommand,
-}
-
-/// The interactive commands
-#[derive(Subcommand, Clone, Debug)]
-pub enum DevTermCommand {
-    /// Continue the previous logs command since the last displayed logs
-    Continue,
-    /// View output from the containers
-    Logs(Logs),
-    /// Reload the app by rebuilding and restarting it
-    Reload,
-    /// Stop your app and the local Lenra environment
-    Stop,
-    /// 'stop' alias
-    Exit,
-    /// Checks the running app
-    Check(Check),
-    /// Exposes the app ports
-    Expose(Expose),
-}
-
-#[derive(Args, Clone, Debug)]
-pub struct Expose {
-    /// The service list to expose
-    #[clap(value_enum, default_values = &["app", "postgres", "mongo"])]
-    pub services: Vec<Service>,
-}
-
-impl DevTermCommand {
-    async fn run(&self, context: &DevTermContext) -> Result<Option<DevTermContext>> {
-        let conf = load_config_file(&context.config).unwrap();
-        match self {
-            DevTermCommand::Continue => warn!("The continue command should not be run"),
-            DevTermCommand::Logs(_logs) => warn!("The logs command should not be run"),
-            DevTermCommand::Stop | DevTermCommand::Exit => {
-                warn!("The stop command should not be run")
-            }
-            DevTermCommand::Reload => {
-                log::debug!("Generates files");
-                conf.generate_files(context.expose.clone(), true).await?;
-
-                log::debug!("Docker compose build");
-                compose_build().await?;
-
-                log::debug!("Starts the containers");
-                compose_up().await?;
-
-                log::debug!("Stop the devtool app env to reset cache");
-                println!("Clearing cache");
-                let result = stop_app_env().await;
-                if let Err(error) = result {
-                    log::error!("{:?}", error);
-                }
-            }
-            DevTermCommand::Check(check) => {
-                if context.expose.contains(&Service::App) {
-                    check.run().await?
-                } else {
-                    println!("The check commands can't run if the ports are not exposed. Run the expose command first");
-                }
-            }
-            DevTermCommand::Expose(expose) => {
-                conf.generate_files(expose.services.clone(), true).await?;
-
-                compose_up().await?;
-
-                let mut ctx = context.clone();
-                ctx.expose = expose.services.clone();
-                return Ok(Some(ctx));
-            }
-        };
-        Ok(None)
-    }
-}
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index 31b518b..6217b13 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -8,6 +8,8 @@ use crate::cli::CliCommand;
 use crate::docker_compose::{create_compose_command, Service};
 use crate::errors::Result;
 
+use super::CommandContext;
+
 #[derive(Args, Default, Clone, Debug)]
 pub struct Logs {
     /// Follow log output
@@ -45,7 +47,7 @@ pub struct Logs {
 
 #[async_trait]
 impl CliCommand for Logs {
-    async fn run(&self) -> Result<()> {
+    async fn run(&self, _context: CommandContext) -> Result<()> {
         log::info!("Show logs");
 
         let mut command = create_compose_command();
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index b0b5f80..79b02b9 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,11 +1,14 @@
+use std::future::Future;
+
 use async_trait::async_trait;
 pub use clap::{Args, Parser, Subcommand};
+use loading::Loading;
 
-use crate::errors::Result;
+use crate::{config::DEFAULT_CONFIG_FILE, docker_compose::Service, errors::Result};
 
 use self::{
-    build::Build, check::Check, dev::Dev, logs::Logs, new::New, start::Start, stop::Stop,
-    update::Update, upgrade::Upgrade,
+    build::Build, check::Check, dev::Dev, logs::Logs, new::New, reload::Reload, start::Start,
+    stop::Stop, update::Update, upgrade::Upgrade,
 };
 
 mod build;
@@ -13,26 +16,40 @@ mod check;
 mod dev;
 mod logs;
 mod new;
+mod reload;
 mod start;
 mod stop;
+pub mod terminal;
 mod update;
 mod upgrade;
 
 /// The Lenra command line interface
-#[derive(Parser)]
+#[derive(Parser, Debug, Clone)]
 #[clap(author, version, about, long_about = None, rename_all = "kebab-case")]
 pub struct Cli {
     #[clap(subcommand)]
-    pub command: Command,
+    pub command: Option<Command>,
+
+    /// The app configuration file.
+    #[clap(global=true, parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
+    pub config: std::path::PathBuf,
+
+    /// Exposes services ports.
+    #[clap(global=true, long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
+    pub expose: Vec<Service>,
+
+    /// Run the commands as verbose.
+    #[clap(global = true, short, long, action)]
+    pub verbose: bool,
 }
 
 #[async_trait]
 pub trait CliCommand {
-    async fn run(&self) -> Result<()>;
+    async fn run(&self, context: CommandContext) -> Result<()>;
 }
 
 /// The subcommands
-#[derive(Subcommand)]
+#[derive(Subcommand, Debug, Clone)]
 pub enum Command {
     /// Create a new Lenra app project from a template
     New(New),
@@ -52,26 +69,59 @@ pub enum Command {
     Update(Update),
     /// Checks the running app
     Check(Check),
+    /// Reload the app by rebuilding and restarting it
+    Reload(Reload),
 }
 
 #[async_trait]
 impl CliCommand for Command {
-    async fn run(&self) -> Result<()> {
+    async fn run(&self, context: CommandContext) -> Result<()> {
+        log::debug!("Run command {:?}", self);
         match self {
-            Command::New(new) => new.run(),
-            Command::Build(build) => build.run(),
-            Command::Start(start) => start.run(),
-            Command::Logs(logs) => logs.run(),
-            Command::Stop(stop) => stop.run(),
-            Command::Dev(dev) => dev.run(),
-            Command::Upgrade(upgrade) => upgrade.run(),
-            Command::Update(update) => update.run(),
-            Command::Check(check) => check.run(),
+            Command::New(new) => new.run(context),
+            Command::Build(build) => build.run(context),
+            Command::Start(start) => start.run(context),
+            Command::Logs(logs) => logs.run(context),
+            Command::Stop(stop) => stop.run(context),
+            Command::Dev(dev) => dev.run(context),
+            Command::Upgrade(upgrade) => upgrade.run(context),
+            Command::Update(update) => update.run(context),
+            Command::Check(check) => check.run(context),
+            Command::Reload(reload) => reload.run(context),
         }
         .await
     }
 }
 
+#[derive(Clone, Debug, Default)]
+pub struct CommandContext {
+    /// The app configuration file.
+    pub config: std::path::PathBuf,
+
+    /// Exposes all services ports.
+    pub expose: Vec<Service>,
+
+    /// Run command as verbose.
+    pub verbose: bool,
+}
+
+pub async fn loader<F, Fut, R>(text: &str, success: &str, fail: &str, task: F) -> Result<R>
+where
+    F: FnOnce() -> Fut,
+    Fut: Future<Output = Result<R>>,
+{
+    let loading = Loading::default();
+    loading.text(text);
+    let res = task().await;
+    if res.is_ok() {
+        loading.success(success);
+    } else {
+        loading.fail(fail);
+    }
+    loading.end();
+    res
+}
+
 #[cfg(test)]
 mod test {
     use clap::{CommandFactory, FromArgMatches};
diff --git a/src/cli/new.rs b/src/cli/new.rs
index 01495fb..ada4189 100644
--- a/src/cli/new.rs
+++ b/src/cli/new.rs
@@ -4,22 +4,14 @@
 
 use async_trait::async_trait;
 pub use clap::Args;
-use log;
-use std::fs;
-use std::path::PathBuf;
 
 use crate::cli::CliCommand;
-use crate::config::LENRA_CACHE_DIRECTORY;
 use crate::errors::{Error, Result};
-use crate::git::{get_current_commit, GIT_REPO_REGEX};
-use crate::template::{
-    choose_repository, clone_template, list_templates, TemplateData, TEMPLATE_DATA_FILE,
-    TEMPLATE_GIT_DIR,
-};
-#[cfg(test)]
-use mocktopus::macros::mockable;
+use crate::{cli, git, lenra, template};
+
+use super::CommandContext;
 
-#[derive(Args)]
+#[derive(Args, Debug, Clone)]
 pub struct New {
     /// The project template topics from which your project will be created.
     /// For example, defining `rust` look for the next API endpoint: https://api.github.com/search/repositories?q=topic:lenra+topic:template+topic:rust&sort=stargazers
@@ -34,53 +26,34 @@ pub struct New {
 
 #[async_trait]
 impl CliCommand for New {
-    async fn run(&self) -> Result<()> {
+    async fn run(&self, _context: CommandContext) -> Result<()> {
         log::debug!("topics {:?}", self.topics);
 
-        let template = if self.topics.len() == 1 && GIT_REPO_REGEX.is_match(self.topics[0].as_str())
-        {
-            self.topics[0].clone()
-        } else {
-            let repos = list_templates(&self.topics).await?;
-            if repos.is_empty() {
-                return Err(Error::NoTemplateFound);
-            } else if repos.len() == 1 {
-                repos[0].url.clone()
+        let template =
+            if self.topics.len() == 1 && git::GIT_REPO_REGEX.is_match(self.topics[0].as_str()) {
+                self.topics[0].clone()
             } else {
-                choose_repository(repos).await?.url
-            }
-        };
-
-        clone_template(template.clone(), self.path.clone()).await?;
+                let repos = template::list_templates(&self.topics).await?;
+                if repos.is_empty() {
+                    return Err(Error::NoTemplateFound);
+                } else if repos.len() == 1 {
+                    repos[0].url.clone()
+                } else {
+                    template::choose_repository(repos).await?.url
+                }
+            };
 
-        // create `.template` file to save template repo url and commit
-        let git_dir = self.path.join(".git");
-        let commit = get_current_commit(Some(git_dir.clone())).await?;
-        TemplateData {
-            template,
-            commit: Some(commit.clone()),
-        }
-        .save_to(&self.path.join(TEMPLATE_DATA_FILE))
+        println!("Using template: {}", template);
+        cli::loader(
+            "Creating new project...",
+            "Project created",
+            "Failed creating new project",
+            || async { lenra::create_new_project(template.as_str(), &self.path).await },
+        )
         .await
-        .map_err(Error::from)?;
-
-        create_cache_directories(&self.path, &git_dir)?;
-
-        Ok(())
     }
 }
 
-#[cfg_attr(test, mockable)]
-fn create_cache_directories(path: &PathBuf, git_dir: &PathBuf) -> Result<()> {
-    log::debug!("create cache directories");
-    // create the `.lenra` cache directory
-    let cache_dir = path.join(LENRA_CACHE_DIRECTORY);
-    fs::create_dir_all(cache_dir.clone()).unwrap();
-    // move the template `.git` directory
-    fs::rename(git_dir, cache_dir.join(TEMPLATE_GIT_DIR))?;
-    Ok(())
-}
-
 #[cfg(test)]
 mod tests {
     use std::{rc::Rc, sync::Mutex};
@@ -90,22 +63,18 @@ mod tests {
     use super::*;
     use crate::{
         cli::{self, Command},
-        git::{self, Repository},
+        git::Repository,
         template,
     };
 
     const NODE_TEMPLATE_HTTP_URL: &str = "https://github.com/lenra-io/template-javascript.git";
     const NODE_TEMPLATE_SSH_URL: &str = "git@github.com:lenra-io/template-javascript.git";
     const BUN_TEMPLATE_HTTP_URL: &str = "https://github.com/taorepoara/lenra-template-bun-js.git";
-    const COMMIT_NUMBER: &str = "398416b76fc237291280de3efb719504c43cf563";
 
     fn mock_all() {
         template::list_templates.mock_safe(|_| unreachable!());
-        template::clone_template.mock_safe(|_, _| unreachable!());
         template::choose_repository.mock_safe(|_| unreachable!());
-        git::get_current_commit.mock_safe(|_| unreachable!());
-        TemplateData::save_to.mock_safe(|_, _| unreachable!());
-        create_cache_directories.mock_safe(|_, _| unreachable!());
+        lenra::create_new_project.mock_safe(|_, _| unreachable!());
     }
 
     #[tokio::test]
@@ -113,7 +82,7 @@ mod tests {
         let cli = cli::test::parse_command_line(String::from("lenra new js"))?;
         let command = cli.command;
         let new = match command {
-            Command::New(new) => new,
+            Some(Command::New(new)) => new,
             _ => panic!("wrong command"),
         };
         let expected_topics = vec!["js".to_string()];
@@ -130,7 +99,11 @@ mod tests {
             assert_eq!(topics, &expected_topics);
             MockResult::Return(Box::pin(async move { Ok(vec![]) }))
         });
-        let result = new.run().await;
+        let result = new
+            .run(CommandContext {
+                ..Default::default()
+            })
+            .await;
         let call_count = *list_templates_call_counter.lock().unwrap();
         println!("called {} times", call_count);
         assert_eq!(call_count, 1);
@@ -148,7 +121,7 @@ mod tests {
         let cli = cli::test::parse_command_line(String::from("lenra new js"))?;
         let command = cli.command;
         let new = match command {
-            Command::New(new) => new,
+            Some(Command::New(new)) => new,
             _ => panic!("wrong command"),
         };
         let expected_topics = vec!["js".to_string()];
@@ -171,41 +144,20 @@ mod tests {
                 }])
             }))
         });
-        let clone_template_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&clone_template_call_counter);
-        template::clone_template.mock_safe(move |url, _| {
+        let create_new_project_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_new_project_call_counter);
+        lenra::create_new_project.mock_safe(move |_, _| {
             let mut num = counter.lock().unwrap();
             *num += 1;
-            assert_eq!(url, NODE_TEMPLATE_HTTP_URL);
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
-        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&get_current_commit_call_counter);
-        git::get_current_commit.mock_safe(move |_| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
-        });
-        let save_to_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&save_to_call_counter);
-        TemplateData::save_to.mock_safe(move |_, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Box::pin(async move { Ok(()) }))
-        });
-        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&create_cache_directories_call_counter);
-        create_cache_directories.mock_safe(move |_, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Ok(()))
-        });
-        let result = new.run().await;
+        let result = new
+            .run(CommandContext {
+                ..Default::default()
+            })
+            .await;
         assert_eq!(*list_templates_call_counter.lock().unwrap(), 1);
-        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
-        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
-        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
-        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        assert_eq!(*create_new_project_call_counter.lock().unwrap(), 1);
         assert!(result.is_ok());
         Ok(())
     }
@@ -215,7 +167,7 @@ mod tests {
         let cli = cli::test::parse_command_line(String::from("lenra new js"))?;
         let command = cli.command;
         let new = match command {
-            Command::New(new) => new,
+            Some(Command::New(new)) => new,
             _ => panic!("wrong command"),
         };
         let expected_topics = vec!["js".to_string()];
@@ -254,41 +206,20 @@ mod tests {
             assert_eq!(repos.len(), 2);
             MockResult::Return(Box::pin(async move { Ok(repos[0].clone()) }))
         });
-        let clone_template_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&clone_template_call_counter);
-        template::clone_template.mock_safe(move |url, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            assert_eq!(url, NODE_TEMPLATE_HTTP_URL);
-            MockResult::Return(Box::pin(async move { Ok(()) }))
-        });
-        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&get_current_commit_call_counter);
-        git::get_current_commit.mock_safe(move |_| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
-        });
-        let save_to_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&save_to_call_counter);
-        TemplateData::save_to.mock_safe(move |_, _| {
+        let create_new_project_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_new_project_call_counter);
+        lenra::create_new_project.mock_safe(move |_, _| {
             let mut num = counter.lock().unwrap();
             *num += 1;
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
-        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&create_cache_directories_call_counter);
-        create_cache_directories.mock_safe(move |_, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Ok(()))
-        });
-        let result = new.run().await;
+        let result = new
+            .run(CommandContext {
+                ..Default::default()
+            })
+            .await;
         assert_eq!(*list_templates_call_counter.lock().unwrap(), 1);
-        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
-        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
-        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
-        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        assert_eq!(*create_new_project_call_counter.lock().unwrap(), 1);
         assert!(result.is_ok());
         Ok(())
     }
@@ -298,7 +229,7 @@ mod tests {
         let cli = cli::test::parse_command_line(format!("lenra new {}", NODE_TEMPLATE_HTTP_URL))?;
         let command = cli.command;
         let new = match command {
-            Command::New(new) => new,
+            Some(Command::New(new)) => new,
             _ => panic!("wrong command"),
         };
         let expected_topics = vec![NODE_TEMPLATE_HTTP_URL.to_string()];
@@ -306,40 +237,19 @@ mod tests {
         assert_eq!(new.path, std::path::PathBuf::from("."));
         assert_eq!(new.topics, expected_topics);
         mock_all();
-        let clone_template_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&clone_template_call_counter);
-        template::clone_template.mock_safe(move |url, _| {
+        let create_new_project_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_new_project_call_counter);
+        lenra::create_new_project.mock_safe(move |_, _| {
             let mut num = counter.lock().unwrap();
             *num += 1;
-            assert_eq!(url, NODE_TEMPLATE_HTTP_URL);
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
-        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&get_current_commit_call_counter);
-        git::get_current_commit.mock_safe(move |_| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
-        });
-        let save_to_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&save_to_call_counter);
-        TemplateData::save_to.mock_safe(move |_, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Box::pin(async move { Ok(()) }))
-        });
-        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&create_cache_directories_call_counter);
-        create_cache_directories.mock_safe(move |_, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Ok(()))
-        });
-        let result = new.run().await;
-        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
-        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
-        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
-        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        let result = new
+            .run(CommandContext {
+                ..Default::default()
+            })
+            .await;
+        assert_eq!(*create_new_project_call_counter.lock().unwrap(), 1);
         assert!(result.is_ok());
         Ok(())
     }
@@ -349,7 +259,7 @@ mod tests {
         let cli = cli::test::parse_command_line(format!("lenra new {}", NODE_TEMPLATE_SSH_URL))?;
         let command = cli.command;
         let new = match command {
-            Command::New(new) => new,
+            Some(Command::New(new)) => new,
             _ => panic!("wrong command"),
         };
         let expected_topics = vec![NODE_TEMPLATE_SSH_URL.to_string()];
@@ -357,40 +267,19 @@ mod tests {
         assert_eq!(new.path, std::path::PathBuf::from("."));
         assert_eq!(new.topics, expected_topics);
         mock_all();
-        let clone_template_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&clone_template_call_counter);
-        template::clone_template.mock_safe(move |url, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            assert_eq!(url, NODE_TEMPLATE_SSH_URL);
-            MockResult::Return(Box::pin(async move { Ok(()) }))
-        });
-        let get_current_commit_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&get_current_commit_call_counter);
-        git::get_current_commit.mock_safe(move |_| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Box::pin(async move { Ok(COMMIT_NUMBER.to_string()) }))
-        });
-        let save_to_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&save_to_call_counter);
-        TemplateData::save_to.mock_safe(move |_, _| {
+        let create_new_project_call_counter = Rc::new(Mutex::new(0));
+        let counter = Rc::clone(&create_new_project_call_counter);
+        lenra::create_new_project.mock_safe(move |_, _| {
             let mut num = counter.lock().unwrap();
             *num += 1;
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
-        let create_cache_directories_call_counter = Rc::new(Mutex::new(0));
-        let counter = Rc::clone(&create_cache_directories_call_counter);
-        create_cache_directories.mock_safe(move |_, _| {
-            let mut num = counter.lock().unwrap();
-            *num += 1;
-            MockResult::Return(Ok(()))
-        });
-        let result = new.run().await;
-        assert_eq!(*clone_template_call_counter.lock().unwrap(), 1);
-        assert_eq!(*get_current_commit_call_counter.lock().unwrap(), 1);
-        assert_eq!(*save_to_call_counter.lock().unwrap(), 1);
-        assert_eq!(*create_cache_directories_call_counter.lock().unwrap(), 1);
+        let result = new
+            .run(CommandContext {
+                ..Default::default()
+            })
+            .await;
+        assert_eq!(*create_new_project_call_counter.lock().unwrap(), 1);
         assert!(result.is_ok());
         Ok(())
     }
diff --git a/src/cli/reload.rs b/src/cli/reload.rs
new file mode 100644
index 0000000..0e371b9
--- /dev/null
+++ b/src/cli/reload.rs
@@ -0,0 +1,24 @@
+use async_trait::async_trait;
+pub use clap::Args;
+
+use crate::cli::CliCommand;
+use crate::errors::Result;
+
+use super::{
+    build::{build_loader, generate_app_env_loader},
+    start::{clear_cache_loader, start_loader},
+    CommandContext,
+};
+
+#[derive(Args, Default, Debug, Clone)]
+pub struct Reload;
+
+#[async_trait]
+impl CliCommand for Reload {
+    async fn run(&self, context: CommandContext) -> Result<()> {
+        generate_app_env_loader(context, false).await?;
+        build_loader().await?;
+        start_loader().await?;
+        clear_cache_loader().await
+    }
+}
diff --git a/src/cli/start.rs b/src/cli/start.rs
index 16018c8..d500c17 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -1,50 +1,41 @@
-use std::path::PathBuf;
-
 use async_trait::async_trait;
 pub use clap::Args;
 
 use crate::cli::CliCommand;
-use crate::config::{load_config_file, DEFAULT_CONFIG_FILE, DOCKERCOMPOSE_DEFAULT_PATH};
-use crate::devtool::stop_app_env;
-use crate::docker_compose::{self, compose_up, Service};
 use crate::errors::Result;
+use crate::lenra;
 
-#[derive(Args, Default)]
-pub struct Start {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
+use super::{loader, CommandContext};
 
-    /// Exposes services ports.
-    #[clap(long, value_enum, default_values = &[], default_missing_values = &["app", "postgres", "mongo"])]
-    pub expose: Vec<Service>,
-}
+#[derive(Args, Default, Debug, Clone)]
+pub struct Start;
 
 #[async_trait]
 impl CliCommand for Start {
-    async fn run(&self) -> Result<()> {
-        log::info!("Starting the app");
-        let conf = load_config_file(&self.config)?;
-
-        let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
-        if !dockercompose_path.exists() {
-            // TODO: check the components API version
-
-            conf.generate_files(self.expose.clone(), true).await?;
-        }
-
-        // Start the containers
-        compose_up().await?;
-        // Stop the devtool app env to reset cache
-        let result = stop_app_env().await;
-        if let Err(error) = result {
-            log::info!("{:?}", error);
-        }
-        // Open the app
-        println!(
-            "\nApplication available at http://localhost:{}\n",
-            docker_compose::DEVTOOL_WEB_PORT
-        );
+    async fn run(&self, _context: CommandContext) -> Result<()> {
+        start_loader().await?;
+        clear_cache_loader().await?;
+        lenra::display_app_access_url();
         Ok(())
     }
 }
+
+pub async fn start_loader() -> Result<()> {
+    loader(
+        "Start app environment...",
+        "App environment started",
+        "Failed starting app",
+        || async { lenra::start_env().await },
+    )
+    .await
+}
+
+pub async fn clear_cache_loader() -> Result<()> {
+    loader(
+        "Clearing cache...",
+        "Cache cleared",
+        "Failed clearing cache",
+        || async { lenra::clear_cache().await },
+    )
+    .await
+}
diff --git a/src/cli/stop.rs b/src/cli/stop.rs
index 75ed5fb..7d151cb 100644
--- a/src/cli/stop.rs
+++ b/src/cli/stop.rs
@@ -1,35 +1,28 @@
-use std::process::Stdio;
-
 use async_trait::async_trait;
 pub use clap::Args;
-use log::warn;
 
 use crate::cli::CliCommand;
-use crate::docker_compose::create_compose_command;
-use crate::errors::{CommandError, Error, Result};
+use crate::errors::Result;
+use crate::lenra;
+
+use super::{loader, CommandContext};
 
-#[derive(Args, Clone)]
+#[derive(Args, Debug, Clone)]
 pub struct Stop;
 
 #[async_trait]
 impl CliCommand for Stop {
-    async fn run(&self) -> Result<()> {
-        log::info!("Stoping the app");
-
-        let mut command = create_compose_command();
-
-        command
-            .arg("down")
-            .arg("--volumes")
-            .stdout(Stdio::inherit())
-            .stderr(Stdio::inherit());
-
-        log::debug!("cmd: {:?}", command);
-        let output = command.spawn()?.wait_with_output().await?;
-        if !output.status.success() {
-            warn!("An error occured while stoping the docker-compose app");
-            return Err(Error::Command(CommandError { command, output }));
-        }
-        Ok(())
+    async fn run(&self, _context: CommandContext) -> Result<()> {
+        stop_loader().await
     }
 }
+
+pub async fn stop_loader() -> Result<()> {
+    loader(
+        "Stop app environment...",
+        "App environment stopped",
+        "Failed stopping app environment",
+        || async { lenra::stop_env().await },
+    )
+    .await
+}
diff --git a/src/cli/terminal.rs b/src/cli/terminal.rs
new file mode 100644
index 0000000..6051b4f
--- /dev/null
+++ b/src/cli/terminal.rs
@@ -0,0 +1,201 @@
+use std::fs;
+
+use crate::lenra;
+pub use clap::{Args, Parser, Subcommand};
+use clap::{CommandFactory, FromArgMatches};
+use colored::{Color, Colorize};
+use dirs::config_dir;
+use log::{debug, warn};
+use rustyline::{error::ReadlineError, Editor};
+
+use crate::{
+    docker_compose::Service,
+    errors::{Error, Result},
+};
+
+use crate::cli::{check::Check, logs::Logs, CliCommand};
+
+use super::{
+    build::Build, dev::Dev, reload::Reload, start::Start, stop::Stop, update::Update,
+    upgrade::Upgrade, CommandContext,
+};
+
+const LENRA_COMMAND: &str = "lenra";
+const READLINE_PROMPT: &str = "[lenra]$ ";
+// const ESCAPE_EVENT: KeyEvent = KeyEvent(KeyCode::Esc, Modifiers::NONE);
+
+pub async fn start_terminal(context: CommandContext) -> Result<()> {
+    let history_path = config_dir()
+        .ok_or(Error::Custom("Can't get the user config directory".into()))?
+        .join("lenra")
+        .join("dev.history");
+    let mut rl = Editor::<()>::new()?;
+
+    debug!("Load history from {:?}", history_path);
+    if rl.load_history(&history_path).is_err() {
+        debug!("No previous history.");
+    }
+
+    let mut context = context.clone();
+
+    loop {
+        let readline = rl.readline(READLINE_PROMPT);
+        let command = match readline {
+            Ok(line) => {
+                if line.trim().is_empty() {
+                    continue;
+                }
+
+                rl.add_history_entry(line.as_str());
+
+                let parse_result = parse_command_line(line.clone()).map_err(Error::from);
+                match parse_result {
+                    Ok(dev_cli) => dev_cli.command,
+                    Err(Error::ParseCommand(clap_error)) => {
+                        clap_error.print().ok();
+                        continue;
+                    }
+                    Err(err) => {
+                        debug!("Parse command error: {}", err);
+                        warn!("not a valid command {}", line);
+                        continue;
+                    }
+                }
+            }
+            Err(ReadlineError::Interrupted) => {
+                debug!("CTRL-C");
+                break;
+            }
+            Err(ReadlineError::Eof) => {
+                debug!("CTRL-D");
+                break;
+            }
+            Err(err) => {
+                println!("Error: {:?}", err);
+                break;
+            }
+        };
+
+        debug!("Run command {:#?}", command);
+        let (ctx_opt, keep_running) = run_command(&command, context.clone()).await;
+        if !keep_running {
+            break;
+        }
+        if let Some(ctx) = ctx_opt {
+            context = ctx.clone();
+        }
+    }
+    debug!("Save history to {:?}", history_path);
+    fs::create_dir_all(history_path.parent().unwrap())?;
+    rl.save_history(&history_path).map_err(Error::from)
+}
+
+pub async fn run_command(
+    command: &TerminalCommand,
+    context: CommandContext,
+) -> (Option<CommandContext>, bool) {
+    debug!("Run command {:#?}", command);
+    let context = command.run(context).await.unwrap_or_else(|error| {
+        eprintln!("{}", error.to_string().color(Color::Red));
+        None
+    });
+    let keep_running = match command {
+        TerminalCommand::Exit | TerminalCommand::Stop(_) => false,
+        _ => true,
+    };
+    (context, keep_running)
+}
+
+fn parse_command_line(line: String) -> Result<TerminalCli, clap::Error> {
+    let args = &mut line.split_whitespace().collect::<Vec<&str>>();
+
+    let first_arg = if args.len() > 0 { Some(args[0]) } else { None };
+    if let Some(arg) = first_arg {
+        if LENRA_COMMAND != arg {
+            args.push(LENRA_COMMAND);
+            args.rotate_right(1);
+        }
+    }
+    debug!("Try to parse dev terminal command: {:?}", args);
+
+    let command = <TerminalCli as CommandFactory>::command();
+    let mut matches = command
+        .clone()
+        .try_get_matches_from(args.clone())
+        .map_err(format_error)?;
+    <TerminalCli as FromArgMatches>::from_arg_matches_mut(&mut matches).map_err(format_error)
+}
+
+fn format_error(err: clap::Error) -> clap::Error {
+    let mut command = <TerminalCli as CommandFactory>::command();
+    err.format(&mut command)
+}
+
+/// The Lenra interactive command line interface
+#[derive(Parser, Debug, Clone)]
+#[clap(rename_all = "kebab-case")]
+pub struct TerminalCli {
+    #[clap(subcommand)]
+    pub command: TerminalCommand,
+}
+
+/// The interactive commands
+#[derive(Subcommand, Clone, Debug)]
+pub enum TerminalCommand {
+    /// Build your app in release mode
+    Build(Build),
+    /// Start your app previously built with the build command
+    Start(Start),
+    /// View output from the containers
+    Logs(Logs),
+    /// Stop your app previously started with the start command
+    Stop(Stop),
+    /// Start the app in an interactive mode
+    Dev(Dev),
+    /// Upgrade the app with the last template updates
+    Upgrade(Upgrade),
+    /// Update the tools Docker images
+    Update(Update),
+    /// Checks the running app
+    Check(Check),
+    /// Reload the app by rebuilding and restarting it
+    Reload(Reload),
+    /// Exits the terminal
+    Exit,
+    /// Exposes the app ports
+    Expose(Expose),
+}
+
+#[derive(Args, Clone, Debug)]
+pub struct Expose {
+    /// The service list to expose
+    #[clap(value_enum, default_values = &["app", "postgres", "mongo"])]
+    pub services: Vec<Service>,
+}
+
+impl TerminalCommand {
+    pub async fn run(&self, context: CommandContext) -> Result<Option<CommandContext>> {
+        log::debug!("Run terminal command {:?}", self);
+        match self {
+            TerminalCommand::Exit => {}
+            TerminalCommand::Expose(expose) => {
+                lenra::generate_app_env(&context.config, &expose.services, false).await?;
+                lenra::start_env().await?;
+
+                let mut ctx = context.clone();
+                ctx.expose = expose.services.clone();
+                return Ok(Some(ctx));
+            }
+            TerminalCommand::Build(build) => build.run(context).await?,
+            TerminalCommand::Start(start) => start.run(context).await?,
+            TerminalCommand::Logs(logs) => logs.run(context).await?,
+            TerminalCommand::Stop(stop) => stop.run(context).await?,
+            TerminalCommand::Dev(dev) => dev.run(context).await?,
+            TerminalCommand::Upgrade(upgrade) => upgrade.run(context).await?,
+            TerminalCommand::Update(update) => update.run(context).await?,
+            TerminalCommand::Check(check) => check.run(context).await?,
+            TerminalCommand::Reload(reload) => reload.run(context).await?,
+        };
+        Ok(None)
+    }
+}
diff --git a/src/cli/update.rs b/src/cli/update.rs
index be6dba4..8c3f589 100644
--- a/src/cli/update.rs
+++ b/src/cli/update.rs
@@ -1,20 +1,15 @@
 use async_trait::async_trait;
 pub use clap::Args;
-use log::{info, warn};
-use tokio::task::JoinSet;
 
 use crate::cli::CliCommand;
-use crate::config::{load_config_file, DEFAULT_CONFIG_FILE};
-use crate::docker;
-use crate::docker_compose::{get_services_images, Service, ServiceImages};
-use crate::errors::{CommandError, Error, Result};
+use crate::docker_compose::Service;
+use crate::errors::Result;
+use crate::lenra;
 
-#[derive(Args, Clone)]
-pub struct Update {
-    /// The app configuration file.
-    #[clap(parse(from_os_str), long, default_value = DEFAULT_CONFIG_FILE)]
-    pub config: std::path::PathBuf,
+use super::{loader, CommandContext};
 
+#[derive(Args, Debug, Clone)]
+pub struct Update {
     /// The service list to pull
     #[clap(value_enum, default_values = &["devtool", "postgres", "mongo"])]
     pub services: Vec<Service>,
@@ -22,63 +17,17 @@ pub struct Update {
 
 #[async_trait]
 impl CliCommand for Update {
-    async fn run(&self) -> Result<()> {
-        log::info!("Updating Docker images");
-
-        let conf = load_config_file(&self.config).ok();
-        let dev_conf = if let Some(dev_opt) = conf.iter().map(|c| &c.dev).next() {
-            dev_opt
-        } else {
-            &None
-        };
-        let images = get_services_images(dev_conf).await;
-
-        // Pull images in parallele
-        let mut processes = JoinSet::new();
-
-        self.services
-            .iter()
-            .filter(|&service| match service {
-                Service::App => false,
-                _ => true,
-            })
-            .for_each(|service| {
-                let imgs = images.clone();
-                let serv = service.clone();
-                processes.spawn(async move { pull_service_image(&imgs, &serv).await });
-            });
-
-        // Wait for all the pull end
-        while let Some(res) = processes.join_next().await {
-            res?;
-        }
-
-        Ok(())
+    async fn run(&self, _context: CommandContext) -> Result<()> {
+        update_loader(&self.services).await
     }
 }
 
-async fn pull_service_image(images: &ServiceImages, service: &Service) {
-    let image = images.get(service);
-    info!("Start pulling {}", image);
-    let mut command = docker::pull(image.clone());
-
-    let spawn_res = command.spawn().map_err(Error::from);
-    if let Err(err) = &spawn_res {
-        warn!("{}", err)
-    }
-    let res = spawn_res
-        .unwrap()
-        .wait_with_output()
-        .await
-        .map_err(Error::from);
-    if let Err(err) = &res {
-        warn!("{}", err)
-    }
-
-    let output = res.unwrap();
-    if !output.status.success() {
-        warn!("{}", CommandError { command, output });
-    } else {
-        info!("Image pulled {}", image);
-    }
+pub async fn update_loader(services: &Vec<Service>) -> Result<()> {
+    loader(
+        "Update environment images...",
+        "Environment images updated",
+        "Failed updating environment images",
+        || async { lenra::update_env_images(services).await },
+    )
+    .await
 }
diff --git a/src/cli/upgrade.rs b/src/cli/upgrade.rs
index faa17a8..8ef1122 100644
--- a/src/cli/upgrade.rs
+++ b/src/cli/upgrade.rs
@@ -1,123 +1,18 @@
-use std::fs;
-use std::path::Path;
-use std::process::Stdio;
-
 use async_trait::async_trait;
 use clap;
-use rustyline::Editor;
 
 use crate::cli::CliCommand;
-use crate::command::get_command_output;
-use crate::config::LENRA_CACHE_DIRECTORY;
-use crate::errors::{Error, Result};
-use crate::git::{self, create_git_command, get_current_commit};
-use crate::template::{
-    clone_template, get_template_data, TemplateData, TEMPLATE_GIT_DIR, TEMPLATE_TEMP_DIR,
-};
+use crate::errors::Result;
+use crate::lenra;
+
+use super::CommandContext;
 
-#[derive(clap::Args)]
-pub struct Upgrade {}
+#[derive(clap::Args, Debug, Clone)]
+pub struct Upgrade;
 
 #[async_trait]
 impl CliCommand for Upgrade {
-    async fn run(&self) -> Result<()> {
-        // get template data
-        let template_data = get_template_data().await?;
-        let git_dir = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_GIT_DIR);
-
-        if git_dir.is_dir() {
-            // update the template repo
-            git::pull(Some(git_dir.clone())).await?;
-        } else {
-            let template_tmp = Path::new(LENRA_CACHE_DIRECTORY).join(TEMPLATE_TEMP_DIR);
-            // clone template project
-            clone_template(template_data.template.clone(), template_tmp.clone()).await?;
-            fs::rename(template_tmp.join(".git"), git_dir.clone())?;
-            fs::remove_dir_all(template_tmp)?;
-        }
-
-        let current_commit = get_current_commit(Some(git_dir.clone())).await?;
-        if let Some(commit) = template_data.commit {
-            if commit == current_commit {
-                println!("This application is already up to date");
-                return Ok(());
-            }
-
-            // get diff between previous commit and current commit
-            let patch_file = Path::new(LENRA_CACHE_DIRECTORY)
-                .join(format!("patch.{}-{}.diff", commit, current_commit));
-            log::debug!(
-                "create patch between {} and {}: {:?}",
-                commit,
-                current_commit,
-                patch_file
-            );
-            let mut cmd = create_git_command();
-            cmd.arg("--git-dir")
-                .arg(git_dir.as_os_str())
-                .arg("diff")
-                .arg(commit)
-                .arg(current_commit.clone());
-            let mut patch = get_command_output(cmd).await?;
-            patch.push('\n');
-            fs::write(patch_file.clone(), patch)?;
-
-            // apply a patch
-            log::debug!("apply patch on project");
-            let mut cmd = create_git_command();
-            cmd.arg("apply")
-                .arg(patch_file.clone())
-                .stdout(Stdio::inherit())
-                .stderr(Stdio::inherit());
-            let patch_file_str = patch_file.to_string_lossy();
-            while !cmd.spawn()?.wait_with_output().await?.status.success() {
-                println!("An error occured applying the patch {patch_file_str}");
-                let mut rl = Editor::<()>::new()?;
-                rl.readline("Fix it and press enter to retry")?;
-            }
-            fs::remove_file(patch_file)?;
-        } else {
-            // ask for user confirmation
-            if !confirm_checkout()? {
-                println!("Upgrade canceled");
-                return Ok(());
-            }
-
-            // checkout the template in the current dir
-            log::debug!("checkout the template");
-            let mut cmd = create_git_command();
-            cmd.arg("--git-dir")
-                .arg(git_dir.as_os_str())
-                .arg("checkout")
-                .arg("HEAD")
-                .arg("--")
-                .arg(".")
-                .stdout(Stdio::inherit())
-                .stderr(Stdio::inherit());
-            cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
-        }
-        // save template data
-        TemplateData {
-            template: template_data.template,
-            commit: Some(current_commit),
-        }
-        .save()
-        .await
-    }
-}
-
-fn confirm_checkout() -> Result<bool> {
-    let mut rl = Editor::<()>::new()?;
-    println!("There is no template last commit in this project, the template files will checked out to your app.\nMake sure your project is saved (for example with git).");
-    loop {
-        let res = rl
-            .readline("Checkout the template ? [y/N] ")?
-            .trim()
-            .to_lowercase();
-        if res == "y" || res == "yes" {
-            return Ok(true);
-        } else if res.is_empty() || res == "n" || res == "no" {
-            return Ok(false);
-        }
+    async fn run(&self, _context: CommandContext) -> Result<()> {
+        lenra::upgrade_app().await
     }
 }
diff --git a/src/command.rs b/src/command.rs
index 33af2ad..e5bf134 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,14 +1,33 @@
+use std::process::{Output, Stdio};
+
 use tokio::process::Command;
 
 use crate::errors::{CommandError, Error, Result};
 
+static mut INHERIT_STDIO: bool = false;
+
+pub fn is_inherit_stdio() -> bool {
+    unsafe { INHERIT_STDIO }
+}
+
+pub fn set_inherit_stdio(val: bool) {
+    unsafe {
+        INHERIT_STDIO = val;
+    }
+}
+
 pub fn create_command(cmd: &str) -> Command {
     let mut cmd = Command::new(cmd);
     cmd.kill_on_drop(true);
+    if is_inherit_stdio() {
+        cmd.stdout(Stdio::inherit()).stderr(Stdio::inherit());
+    } else {
+        cmd.stdout(Stdio::null()).stderr(Stdio::null());
+    }
     cmd
 }
 
-pub async fn get_command_output(command: Command) -> Result<String> {
+pub async fn run_command(command: Command) -> Result<Output> {
     let mut command = Command::from(command);
     let output = command.output().await?;
 
@@ -16,6 +35,12 @@ pub async fn get_command_output(command: Command) -> Result<String> {
         return Err(Error::Command(CommandError { command, output }));
     }
 
+    Ok(output)
+}
+
+pub async fn get_command_output(command: Command) -> Result<String> {
+    let output = run_command(command).await?;
+
     String::from_utf8(output.stdout)
         .map(|name| name.trim().to_string())
         .map_err(Error::from)
diff --git a/src/config.rs b/src/config.rs
index 9c94e77..c9cb61b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -116,7 +116,7 @@ pub struct Dockerfile {
 
 impl Application {
     /// Generates all the files needed to build and run the application
-    pub async fn generate_files(&self, exposed_services: Vec<Service>, debug: bool) -> Result<()> {
+    pub async fn generate_files(&self, exposed_services: &Vec<Service>, debug: bool) -> Result<()> {
         self.generate_docker_files(debug)?;
         self.generate_docker_compose_file(exposed_services, debug)
             .await?;
@@ -148,7 +148,7 @@ impl Application {
 
     pub async fn generate_docker_compose_file(
         &self,
-        exposed_services: Vec<Service>,
+        exposed_services: &Vec<Service>,
         debug: bool,
     ) -> Result<()> {
         log::info!("Docker Compose file generation");
diff --git a/src/docker.rs b/src/docker.rs
index 0d98181..28db242 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -4,13 +4,6 @@ use std::{
 };
 
 use regex::Regex;
-use tokio::process::Command;
-
-pub fn pull(image: String) -> Command {
-    let mut cmd = Command::new("docker");
-    cmd.kill_on_drop(true).arg("pull").arg(image);
-    cmd
-}
 
 pub fn normalize_tag(tag: String) -> String {
     let re = Regex::new(r"[^A-Za-z0-9._-]").unwrap();
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index f1e85a7..bf5553e 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -2,12 +2,16 @@ use docker_compose_types::{
     AdvancedBuildStep, BuildStep, Command, Compose, DependsCondition, DependsOnOptions, Deploy,
     EnvTypes, Environment, Healthcheck, HealthcheckTest, Limits, Resources, Services,
 };
+use itertools::Itertools;
 use lazy_static::lazy_static;
 use log::{debug, warn};
+use serde::{Deserialize, Serialize};
 use std::process::Stdio;
 use std::{convert::TryInto, env, fs, path::PathBuf};
+use strum::Display;
 use tokio::process;
 
+use crate::command::{get_command_output, is_inherit_stdio};
 use crate::config::Image;
 use crate::docker::normalize_tag;
 use crate::errors::Error;
@@ -20,7 +24,7 @@ use crate::{
 pub const APP_SERVICE_NAME: &str = "app";
 pub const DEVTOOL_SERVICE_NAME: &str = "devtool";
 pub const POSTGRES_SERVICE_NAME: &str = "postgres";
-pub const MONGO_SERVICE_NAME: &str = "mongodb";
+pub const MONGO_SERVICE_NAME: &str = "mongo";
 const APP_BASE_IMAGE: &str = "lenra/app/";
 const APP_DEFAULT_IMAGE: &str = "my";
 const APP_DEFAULT_IMAGE_TAG: &str = "latest";
@@ -29,7 +33,7 @@ const DEVTOOL_DEFAULT_TAG: &str = "beta";
 const POSTGRES_IMAGE: &str = "postgres";
 const POSTGRES_IMAGE_TAG: &str = "13";
 const MONGO_IMAGE: &str = "mongo";
-const MONGO_IMAGE_TAG: &str = "5.0.11-focal";
+const MONGO_IMAGE_TAG: &str = "5";
 pub const OF_WATCHDOG_PORT: u16 = 8080;
 pub const DEVTOOL_WEB_PORT: u16 = 4000;
 pub const DEVTOOL_API_PORT: u16 = 4001;
@@ -43,11 +47,77 @@ lazy_static! {
     static ref COMPOSE_COMMAND: std::process::Command = get_compose_command();
 }
 
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct ServiceInformations {
+    service: Service,
+    #[serde(rename = "ID")]
+    id: String,
+    name: String,
+    image: String,
+    command: String,
+    project: String,
+    state: ServiceState,
+    status: String,
+    created: String,
+    health: String,
+    exit_code: String,
+    publishers: Vec<Publisher>,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[serde(rename_all = "PascalCase")]
+pub struct Publisher {
+    #[serde(rename = "URL")]
+    url: String,
+    target_port: u16,
+    published_port: u16,
+    protocol: String,
+}
+
+#[derive(clap::ValueEnum, Serialize, Deserialize, Clone, Debug, PartialEq, Display)]
+pub enum Service {
+    App,
+    Devtool,
+    Postgres,
+    Mongo,
+}
+
+impl Service {
+    pub fn to_str(&self) -> &str {
+        match self {
+            Service::App => APP_SERVICE_NAME,
+            Service::Devtool => DEVTOOL_SERVICE_NAME,
+            Service::Postgres => POSTGRES_SERVICE_NAME,
+            Service::Mongo => MONGO_SERVICE_NAME,
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct ServiceImages {
+    pub app: String,
+    pub devtool: String,
+    pub postgres: String,
+    pub mongo: String,
+}
+
+#[derive(clap::ValueEnum, Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub enum ServiceState {
+    Running,
+    Paused,
+    Restarting,
+    Removing,
+    Dead,
+    Created,
+    Exited,
+}
+
 /// Generates the docker-compose.yml file
 pub async fn generate_docker_compose(
     dockerfile: PathBuf,
     dev_conf: &Option<Dev>,
-    exposed_services: Vec<Service>,
+    exposed_services: &Vec<Service>,
     debug: bool,
 ) -> Result<()> {
     let compose_content =
@@ -60,7 +130,7 @@ pub async fn generate_docker_compose(
 async fn generate_docker_compose_content(
     dockerfile: PathBuf,
     dev_conf: &Option<Dev>,
-    exposed_services: Vec<Service>,
+    exposed_services: &Vec<Service>,
     debug: bool,
 ) -> Result<String> {
     let mut devtool_env_vec: Vec<(String, Option<EnvTypes>)> = vec![
@@ -262,19 +332,18 @@ pub fn create_compose_command() -> process::Command {
     let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
     let mut cmd = process::Command::from(COMPOSE_COMMAND.clone());
     cmd.arg("-f").arg(dockercompose_path).kill_on_drop(true);
-
+    if is_inherit_stdio() {
+        cmd.stdout(Stdio::inherit()).stderr(Stdio::inherit());
+    } else {
+        cmd.stdout(Stdio::null()).stderr(Stdio::null());
+    }
     cmd
 }
 
 pub async fn compose_up() -> Result<()> {
     let mut command = create_compose_command();
 
-    command
-        .arg("up")
-        .arg("-d")
-        .arg("--wait")
-        .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit());
+    command.arg("up").arg("-d").arg("--wait");
 
     log::debug!("cmd: {:?}", command);
     let output = command.spawn()?.wait_with_output().await?;
@@ -288,6 +357,20 @@ pub async fn compose_up() -> Result<()> {
     Ok(())
 }
 
+pub async fn compose_down() -> Result<()> {
+    let mut command = create_compose_command();
+
+    command.arg("down").arg("--volumes");
+
+    log::debug!("cmd: {:?}", command);
+    let output = command.spawn()?.wait_with_output().await?;
+    if !output.status.success() {
+        warn!("An error occured while stoping the docker-compose app");
+        return Err(Error::Command(CommandError { command, output }));
+    }
+    Ok(())
+}
+
 pub async fn compose_build() -> Result<()> {
     let mut command = create_compose_command();
     command.arg("build");
@@ -295,10 +378,27 @@ pub async fn compose_build() -> Result<()> {
     // Use Buildkit to improve performance
     command.env("DOCKER_BUILDKIT", "1");
 
-    // Display std out & err
-    command.stdout(Stdio::inherit()).stderr(Stdio::inherit());
+    log::debug!("cmd: {:?}", command);
+    let output = command.spawn()?.wait_with_output().await?;
+
+    if !output.status.success() {
+        warn!(
+            "An error occured while building the Docker image:\n{}",
+            CommandError { command, output }
+        )
+    }
+    Ok(())
+}
+
+pub async fn compose_pull(services: Vec<&str>) -> Result<()> {
+    log::debug!("Pulling services: {:?}", services);
+    let mut command = create_compose_command();
+    command.arg("pull");
+    services.iter().for_each(|service| {
+        command.arg(service);
+    });
 
-    log::debug!("Build: {:?}", command);
+    log::debug!("cmd: {:?}", command);
     let output = command.spawn()?.wait_with_output().await?;
 
     if !output.status.success() {
@@ -310,6 +410,58 @@ pub async fn compose_build() -> Result<()> {
     Ok(())
 }
 
+/// List all the current Docker Compose running services
+pub async fn list_running_services() -> Result<Vec<Service>> {
+    let mut command = create_compose_command();
+    command
+        .arg("ps")
+        .arg("--services")
+        .arg("--filter")
+        .arg("status=running");
+
+    let services: Vec<Service> = get_command_output(command).await.map(|output| {
+        output
+            .lines()
+            .map(|service| match service.trim() {
+                APP_SERVICE_NAME => Some(Service::App),
+                DEVTOOL_SERVICE_NAME => Some(Service::Devtool),
+                POSTGRES_SERVICE_NAME => Some(Service::Postgres),
+                MONGO_SERVICE_NAME => Some(Service::Mongo),
+                _ => None,
+            })
+            .filter_map(|service| service)
+            .collect()
+    })?;
+    Ok(services)
+}
+
+/// Get the given Docker Compose service information
+pub async fn get_service_informations(service: Service) -> Result<ServiceInformations> {
+    let mut command = create_compose_command();
+    let service_name = service.to_str();
+    command
+        .arg("ps")
+        .arg(service_name)
+        .arg("--format")
+        .arg("json");
+
+    let output = get_command_output(command).await?;
+    let infos: ServiceInformations = serde_yaml::from_str(output.as_str())?;
+    Ok(infos)
+}
+
+/// Get the given Docker Compose service published port
+pub async fn get_service_published_ports(service: Service) -> Result<Vec<u16>> {
+    let infos = get_service_informations(service).await?;
+    let ports = infos
+        .publishers
+        .iter()
+        .map(|publisher| publisher.published_port)
+        .unique()
+        .collect();
+    Ok(ports)
+}
+
 pub async fn execute_compose_service_command(service: &str, cmd: &[&str]) -> Result<String> {
     let mut command = create_compose_command();
 
@@ -382,47 +534,11 @@ pub async fn get_services_images(dev_conf: &Option<Dev>) -> ServiceImages {
     }
 }
 
-#[derive(clap::ValueEnum, Clone, Debug, PartialEq)]
-pub enum Service {
-    App,
-    Devtool,
-    Postgres,
-    Mongo,
-}
-
-impl Service {
-    pub fn to_str(&self) -> &str {
-        match self {
-            Service::App => APP_SERVICE_NAME,
-            Service::Devtool => DEVTOOL_SERVICE_NAME,
-            Service::Postgres => POSTGRES_SERVICE_NAME,
-            Service::Mongo => MONGO_SERVICE_NAME,
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct ServiceImages {
-    pub app: String,
-    pub devtool: String,
-    pub postgres: String,
-    pub mongo: String,
-}
-
-impl ServiceImages {
-    pub fn get(&self, service: &Service) -> String {
-        match service {
-            Service::App => self.app.clone(),
-            Service::Devtool => self.devtool.clone(),
-            Service::Postgres => self.postgres.clone(),
-            Service::Mongo => self.mongo.clone(),
-        }
-    }
-}
-
 fn get_compose_command() -> std::process::Command {
     match std::process::Command::new("docker-compose")
         .arg("version")
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
         .spawn()
     {
         Ok(_) => {
@@ -481,22 +597,16 @@ mod test_get_services_images {
             ..Default::default()
         }))
         .await;
+        assert_eq!(images.app, format!("lenra/app/lenra_cli:{}", app_tag));
         assert_eq!(
-            images.get(&Service::App),
-            format!("lenra/app/lenra_cli:{}", app_tag)
-        );
-        assert_eq!(
-            images.get(&Service::Devtool),
+            images.devtool,
             format!("{}:{}", DEVTOOL_IMAGE, DEVTOOL_DEFAULT_TAG)
         );
         assert_eq!(
-            images.get(&Service::Postgres),
+            images.postgres,
             format!("{}:{}", POSTGRES_IMAGE, POSTGRES_IMAGE_TAG)
         );
-        assert_eq!(
-            images.get(&Service::Mongo),
-            format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG)
-        );
+        assert_eq!(images.mongo, format!("{}:{}", MONGO_IMAGE, MONGO_IMAGE_TAG));
     }
 
     #[tokio::test]
@@ -504,10 +614,7 @@ mod test_get_services_images {
         git::get_current_branch
             .mock_safe(|_| MockResult::Return(Box::pin(async move { Ok("test".to_string()) })));
         let images: ServiceImages = get_services_images(&None).await;
-        assert_eq!(
-            images.get(&Service::App),
-            "lenra/app/lenra_cli:test".to_string()
-        );
+        assert_eq!(images.app, "lenra/app/lenra_cli:test".to_string());
     }
 
     #[tokio::test]
@@ -519,7 +626,7 @@ mod test_get_services_images {
         });
         let images: ServiceImages = get_services_images(&None).await;
         assert_eq!(
-            images.get(&Service::App),
+            images.app,
             "lenra/app/lenra_cli:prefixed-branch-name_withUnderscore".to_string()
         );
     }
@@ -544,9 +651,6 @@ mod test_get_services_images {
             MockResult::Return(Box::pin(async move { Ok(branch) }))
         });
         let images: ServiceImages = get_services_images(&None).await;
-        assert_eq!(
-            images.get(&Service::App),
-            format!("lenra/app/lenra_cli:{}", tag)
-        );
+        assert_eq!(images.app, format!("lenra/app/lenra_cli:{}", tag));
     }
 }
diff --git a/src/errors.rs b/src/errors.rs
index 36f31ae..ade1445 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -4,6 +4,8 @@ use rustyline::error::ReadlineError;
 use thiserror::Error;
 use tokio::{process::Command, task::JoinError};
 
+use crate::docker_compose::Service;
+
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Error, Debug)]
@@ -28,6 +30,14 @@ pub enum Error {
     Command(#[from] CommandError),
     #[error("{0}")]
     FromUtf8(#[from] FromUtf8Error),
+    #[error("The {0} service is not exposed")]
+    ServiceNotExposed(Service),
+    #[error("Some services are not started")]
+    NotStartedServices,
+    #[error("The app must be built before running it")]
+    NeverBuiltApp,
+    #[error("The new project directory is not empty")]
+    ProjectPathNotEmpty,
     #[error("Check error")]
     Check,
     #[error("The next GitHub topic is not correct: {0}")]
diff --git a/src/lenra.rs b/src/lenra.rs
new file mode 100644
index 0000000..027b99a
--- /dev/null
+++ b/src/lenra.rs
@@ -0,0 +1,222 @@
+use std::{
+    fs,
+    path::{Path, PathBuf},
+    process::Stdio,
+};
+
+use rustyline::Editor;
+
+use crate::{
+    command::get_command_output,
+    config::{load_config_file, DOCKERCOMPOSE_DEFAULT_PATH, LENRA_CACHE_DIRECTORY},
+    devtool::stop_app_env,
+    docker_compose::{
+        self, compose_build, compose_down, compose_up, list_running_services, Service,
+    },
+    errors::{Error, Result},
+    git,
+    template::{self, TemplateData},
+};
+
+#[cfg(test)]
+use mocktopus::macros::mockable;
+
+#[cfg_attr(test, mockable)]
+pub async fn create_new_project(template: &str, path: &PathBuf) -> Result<()> {
+    log::info!("Creating a new project");
+    // check that the path does not exists or is empty
+    if path.exists() && path.read_dir().map_err(Error::from)?.next().is_some() {
+        return Err(Error::ProjectPathNotEmpty);
+    }
+
+    template::clone_template(template, path).await?;
+
+    // create `.template` file to save template repo url and commit
+    let git_dir = path.join(".git");
+    let commit = git::get_current_commit(Some(git_dir.clone())).await?;
+    TemplateData {
+        template: template.to_string(),
+        commit: Some(commit.clone()),
+    }
+    .save_to(&path.join(template::TEMPLATE_DATA_FILE))
+    .await
+    .map_err(Error::from)?;
+
+    create_cache_directories(path, &git_dir)?;
+
+    log::info!("Project created");
+    Ok(())
+}
+
+#[cfg_attr(test, mockable)]
+fn create_cache_directories(path: &PathBuf, git_dir: &PathBuf) -> Result<()> {
+    log::debug!("create cache directories");
+    // create the `.lenra` cache directory
+    let cache_dir = path.join(LENRA_CACHE_DIRECTORY);
+    fs::create_dir_all(cache_dir.clone()).unwrap();
+    // move the template `.git` directory
+    fs::rename(git_dir, cache_dir.join(template::TEMPLATE_GIT_DIR))?;
+
+    log::info!("Project created");
+    Ok(())
+}
+
+pub async fn generate_app_env(
+    config: &PathBuf,
+    expose: &Vec<Service>,
+    production: bool,
+) -> Result<()> {
+    log::info!("Generating the app environment");
+    let conf = load_config_file(config)?;
+    // TODO: check the components API version
+
+    conf.generate_files(expose, !production).await?;
+    Ok(())
+}
+
+pub async fn build_app() -> Result<()> {
+    log::info!("Build the Docker image");
+    compose_build().await?;
+    log::info!("Image built");
+    Ok(())
+}
+
+pub async fn start_env() -> Result<()> {
+    let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+    if !dockercompose_path.exists() {
+        return Err(Error::NeverBuiltApp);
+    }
+
+    log::info!("Start the containers");
+    compose_up().await?;
+    let running_services: Vec<Service> = list_running_services().await?;
+    if running_services.len() < 4 {
+        return Err(Error::NotStartedServices);
+    }
+    Ok(())
+}
+
+pub async fn stop_env() -> Result<()> {
+    log::info!("Stop the containers");
+    compose_down().await?;
+    Ok(())
+}
+
+pub async fn clear_cache() -> Result<()> {
+    log::info!("Clearing cache");
+    stop_app_env().await?;
+    Ok(())
+}
+
+pub fn display_app_access_url() {
+    println!(
+        "\nApplication available at http://localhost:{}\n",
+        docker_compose::DEVTOOL_WEB_PORT
+    );
+}
+
+pub async fn update_env_images(services: &Vec<Service>) -> Result<()> {
+    log::info!("Update the environment images");
+    docker_compose::compose_pull(services.iter().map(|service| service.to_str()).collect()).await?;
+    Ok(())
+}
+
+pub async fn upgrade_app() -> Result<()> {
+    log::info!("Upgrading the application");
+    // get template data
+    let template_data = template::get_template_data().await?;
+    let git_dir = Path::new(LENRA_CACHE_DIRECTORY).join(template::TEMPLATE_GIT_DIR);
+
+    if git_dir.is_dir() {
+        // update the template repo
+        git::pull(Some(git_dir.clone())).await?;
+    } else {
+        let template_tmp = Path::new(LENRA_CACHE_DIRECTORY).join(template::TEMPLATE_TEMP_DIR);
+        // clone template project
+        template::clone_template(template_data.template.as_str(), &template_tmp).await?;
+        fs::rename(template_tmp.join(".git"), git_dir.clone())?;
+        fs::remove_dir_all(template_tmp)?;
+    }
+
+    let current_commit = git::get_current_commit(Some(git_dir.clone())).await?;
+    if let Some(commit) = template_data.commit {
+        if commit == current_commit {
+            println!("This application is already up to date");
+            return Ok(());
+        }
+
+        // get diff between previous commit and current commit
+        let patch_file = Path::new(LENRA_CACHE_DIRECTORY)
+            .join(format!("patch.{}-{}.diff", commit, current_commit));
+        log::debug!(
+            "create patch between {} and {}: {:?}",
+            commit,
+            current_commit,
+            patch_file
+        );
+        let mut cmd = git::create_git_command();
+        cmd.arg("--git-dir")
+            .arg(git_dir.as_os_str())
+            .arg("diff")
+            .arg(commit)
+            .arg(current_commit.clone());
+        let mut patch = get_command_output(cmd).await?;
+        patch.push('\n');
+        fs::write(patch_file.clone(), patch)?;
+
+        // apply a patch
+        log::debug!("apply patch on project");
+        let mut cmd = git::create_git_command();
+        cmd.arg("apply")
+            .arg(patch_file.clone())
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit());
+        let patch_file_str = patch_file.to_string_lossy();
+        while !cmd.spawn()?.wait_with_output().await?.status.success() {
+            println!("An error occured applying the patch {patch_file_str}");
+            let mut rl = Editor::<()>::new()?;
+            rl.readline("Fix it and press enter to retry")?;
+        }
+        fs::remove_file(patch_file)?;
+    } else {
+        // ask for user confirmation
+        if !confirm_checkout()? {
+            println!("Upgrade canceled");
+            return Ok(());
+        }
+
+        // checkout the template in the current dir
+        log::debug!("checkout the template");
+        let mut cmd = git::create_git_command();
+        cmd.arg("--git-dir")
+            .arg(git_dir.as_os_str())
+            .arg("checkout")
+            .arg("HEAD")
+            .arg("--")
+            .arg(".");
+        cmd.spawn()?.wait_with_output().await.map_err(Error::from)?;
+    }
+    // save template data
+    TemplateData {
+        template: template_data.template,
+        commit: Some(current_commit),
+    }
+    .save()
+    .await
+}
+
+fn confirm_checkout() -> Result<bool> {
+    let mut rl = Editor::<()>::new()?;
+    println!("There is no template last commit in this project, the template files will checked out to your app.\nMake sure your project is saved (for example with git).");
+    loop {
+        let res = rl
+            .readline("Checkout the template ? [y/N] ")?
+            .trim()
+            .to_lowercase();
+        if res == "y" || res == "yes" {
+            return Ok(true);
+        } else if res.is_empty() || res == "n" || res == "no" {
+            return Ok(false);
+        }
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 1f0a7de..4b43429 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@
 //! The Lenra's command line interface
 
 use clap::Parser;
-use cli::{Cli, CliCommand};
+use cli::{terminal::start_terminal, Cli, CliCommand, CommandContext};
 use env_logger;
 
 mod cli;
@@ -16,6 +16,7 @@ mod errors;
 mod git;
 mod github;
 mod keyboard_event;
+mod lenra;
 mod matching;
 mod template;
 
@@ -23,7 +24,19 @@ mod template;
 async fn main() -> () {
     env_logger::init();
     let args = Cli::parse();
-    match args.command.run().await {
+    let context = CommandContext {
+        config: args.config.clone(),
+        expose: args.expose.clone(),
+        verbose: args.verbose,
+    };
+    if args.verbose {
+        command::set_inherit_stdio(true);
+    }
+    let res = match args.command {
+        Some(command) => command.run(context).await,
+        None => start_terminal(context).await,
+    };
+    match res {
         Ok(_) => (),
         Err(e) => {
             println!("{}", e.to_string());
diff --git a/src/template.rs b/src/template.rs
index dc97368..032cd21 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use crate::{
-    command::get_command_output,
+    command::{get_command_output, run_command},
     config::LENRA_CACHE_DIRECTORY,
     errors::{Error, Result},
     git::{create_git_command, Repository},
@@ -115,20 +115,15 @@ pub async fn choose_repository(repos: Vec<Repository>) -> Result<Repository> {
 }
 
 #[cfg_attr(test, mockable)]
-pub async fn clone_template(template: String, target_dir: PathBuf) -> Result<()> {
+pub async fn clone_template(template: &str, target_dir: &PathBuf) -> Result<()> {
     log::debug!(
         "clone the template {} into {}",
         template,
         target_dir.display()
     );
-    create_git_command()
-        .arg("clone")
-        .arg(template)
-        .arg(target_dir.as_os_str())
-        .spawn()?
-        .wait_with_output()
-        .await
-        .map_err(Error::from)?;
+    let mut cmd = create_git_command();
+    cmd.arg("clone").arg(template).arg(target_dir.as_os_str());
+    run_command(cmd).await?;
 
     Ok(())
 }

From f4f8e0dd100eb810ee2df4fd5d5b247077fe796a Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Thu, 27 Jul 2023 14:02:36 +0200
Subject: [PATCH 73/76] feat: Expose oauth port (#303)

---
 src/docker_compose.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index bf5553e..acb6661 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -37,6 +37,7 @@ const MONGO_IMAGE_TAG: &str = "5";
 pub const OF_WATCHDOG_PORT: u16 = 8080;
 pub const DEVTOOL_WEB_PORT: u16 = 4000;
 pub const DEVTOOL_API_PORT: u16 = 4001;
+pub const DEVTOOL_OAUTH_PORT: u16 = 4444;
 pub const MONGO_PORT: u16 = 27017;
 pub const POSTGRES_PORT: u16 = 5432;
 pub const NON_ROOT_USER: &str = "12000";
@@ -240,7 +241,7 @@ async fn generate_docker_compose_content(
                     DEVTOOL_SERVICE_NAME.into(),
                     Some(docker_compose_types::Service {
                         image: Some(service_images.devtool),
-                        ports: Some(vec![DEVTOOL_WEB_PORT, DEVTOOL_API_PORT].into_iter().map(port_to_port_binding).collect()),
+                        ports: Some(vec![DEVTOOL_WEB_PORT, DEVTOOL_API_PORT, DEVTOOL_OAUTH_PORT].into_iter().map(port_to_port_binding).collect()),
                         environment: Some(Environment::KvPair(devtool_envs.into())),
                         healthcheck: Some(Healthcheck {
                             test: Some(HealthcheckTest::Multiple(vec![

From a1adc1e4e8558be68f480eb0f0f5d9ee45d102e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 20:45:03 +0200
Subject: [PATCH 74/76] build(deps): bump strum from 0.24.1 to 0.25.0 (#300)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 10 +++++-----
 Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index efb0484..83cbc5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1130,24 +1130,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "strum"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.24.3"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 28f95b8..432a6cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ colored = "2.0.0"
 ureq = { version = "2.6.2", features = ["json"] }
 tokio = { version = "1.27.0", features = ["full"] }
 async-trait = "0.1.68"
-strum = { version = "0.24.1", features = ["strum_macros", "derive"] }
+strum = { version = "0.25.0", features = ["strum_macros", "derive"] }
 itertools = "0.11.0"
 loading = "0.3.0"
 

From 9b472256e2625fcf02290cd26245b3f9e8d0d00b Mon Sep 17 00:00:00 2001
From: Thomas DA ROCHA <thomas.darocha@lenra.io>
Date: Fri, 15 Sep 2023 15:13:50 +0200
Subject: [PATCH 75/76] feat: Handle lenra app path in the config  (#317)

Co-authored-by: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com>
---
 Cargo.lock               | 167 ++++++++++++++++++++++++++++++++++
 Cargo.toml               |   3 +-
 docs/config-file.md      |  16 ++--
 src/cli/build.rs         |  12 +--
 src/cli/check/mod.rs     |   7 +-
 src/cli/dev/mod.rs       |  22 ++---
 src/cli/logs.rs          |   4 +-
 src/cli/mod.rs           | 190 +++++++++++++++++++++++++++++++++++++--
 src/cli/new.rs           |  12 +--
 src/cli/reload.rs        |   8 +-
 src/cli/start.rs         |  14 +--
 src/cli/stop.rs          |   8 +-
 src/cli/terminal.rs      |  44 ++++-----
 src/cli/update.rs        |   8 +-
 src/cli/upgrade.rs       |   2 +-
 src/config.rs            |  70 ++++++++-------
 src/devtool.rs           |   8 +-
 src/docker_compose.rs    |  58 +++++++-----
 src/lenra.rs             |  44 ++++-----
 src/main.rs              |   7 +-
 test/config/app_path.yml |   4 +
 21 files changed, 543 insertions(+), 165 deletions(-)
 create mode 100644 test/config/app_path.yml

diff --git a/Cargo.lock b/Cargo.lock
index 83cbc5e..651a9ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -447,6 +447,101 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.27",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-timer"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -464,6 +559,12 @@ version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -622,6 +723,7 @@ dependencies = [
  "log",
  "mocktopus",
  "regex",
+ "rstest",
  "rustyline",
  "serde",
  "serde_json",
@@ -814,6 +916,12 @@ version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -924,6 +1032,12 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
+[[package]]
+name = "relative-path"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca"
+
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -939,12 +1053,50 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rstest"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199"
+dependencies = [
+ "futures",
+ "futures-timer",
+ "rstest_macros",
+ "rustc_version",
+]
+
+[[package]]
+name = "rstest_macros"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605"
+dependencies = [
+ "cfg-if",
+ "glob",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "relative-path",
+ "rustc_version",
+ "syn 2.0.27",
+ "unicode-ident",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.4"
@@ -1041,6 +1193,12 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+
 [[package]]
 name = "serde"
 version = "1.0.175"
@@ -1094,6 +1252,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.11.0"
diff --git a/Cargo.toml b/Cargo.toml
index 432a6cb..8af0308 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,5 +44,4 @@ loading = "0.3.0"
 
 [dev-dependencies]
 mocktopus = "0.8.0"
-# assert_cmd = "2.0.11"
-# predicates = "3.0.3"
+rstest = "0.18.2"
diff --git a/docs/config-file.md b/docs/config-file.md
index 4fcdfd8..9c9ef2e 100644
--- a/docs/config-file.md
+++ b/docs/config-file.md
@@ -8,7 +8,7 @@ The Lenra's configuration file describes your Lenra app configurations, like API
 Here is an example using a Dofigen file:
 
 ```yaml
-componentsApi: "1.0"
+path: "."
 generator:
   dofigen: dofigen.yml
 ```
@@ -17,17 +17,19 @@ generator:
 
 The configuration is the main element of the file:
 
-| Field           | Type                    | Description                 |
-| --------------- | ----------------------- | --------------------------- |
-| `componentsApi` | String                  | The components API version  |
-| `generator`     | [Generator](#generator) | The generator configuration |
+| Field       | Type                    | Description                    |
+| ----------- | ----------------------- | ------------------------------ |
+| `path`      | String                  | The project path (default ".") |
+| `generator` | [Generator](#generator) | The generator configuration    |
 
 ## Generator
 
 The generator define your application is built. There are many configurators:
 
-- [Dofigen](#dofigen)
-- [Docker](#docker)
+- [Configuration](#configuration)
+- [Generator](#generator)
+  - [Dofigen](#dofigen)
+  - [Docker](#docker)
 
 ### Dofigen
 
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 88d0f0d..f57ddfe 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -17,28 +17,28 @@ pub struct Build {
 
 #[async_trait]
 impl CliCommand for Build {
-    async fn run(&self, context: CommandContext) -> Result<()> {
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
         generate_app_env_loader(context, self.production).await?;
-        build_loader().await
+        build_loader(context).await
     }
 }
 
-pub async fn generate_app_env_loader(context: CommandContext, production: bool) -> Result<()> {
+pub async fn generate_app_env_loader(context: &mut CommandContext, production: bool) -> Result<()> {
     loader(
         "Generate app env...",
         "App env generated",
         "Failed generating app env",
-        || async { lenra::generate_app_env(&context.config, &context.expose, production).await },
+        || async { lenra::generate_app_env(context, production).await },
     )
     .await
 }
 
-pub async fn build_loader() -> Result<()> {
+pub async fn build_loader(context: &mut CommandContext) -> Result<()> {
     loader(
         "Build app...",
         "App built",
         "Failed building app",
-        || async { lenra::build_app().await },
+        || async { lenra::build_app(context).await },
     )
     .await
 }
diff --git a/src/cli/check/mod.rs b/src/cli/check/mod.rs
index 31cd689..c17c26d 100644
--- a/src/cli/check/mod.rs
+++ b/src/cli/check/mod.rs
@@ -38,9 +38,12 @@ pub enum CheckCommandType {
 
 #[async_trait]
 impl CliCommand for Check {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
         // check that the app service is exposed
-        if get_service_published_ports(Service::App).await?.is_empty() {
+        if get_service_published_ports(context, Service::App)
+            .await?
+            .is_empty()
+        {
             return Err(Error::ServiceNotExposed(Service::App));
         }
         match self.command.clone() {
diff --git a/src/cli/dev/mod.rs b/src/cli/dev/mod.rs
index d60c556..c89caac 100644
--- a/src/cli/dev/mod.rs
+++ b/src/cli/dev/mod.rs
@@ -30,14 +30,14 @@ pub struct Dev {
 
 #[async_trait]
 impl CliCommand for Dev {
-    async fn run(&self, context: CommandContext) -> Result<()> {
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
         log::info!("Run dev mode");
 
         if !self.attach {
-            build::generate_app_env_loader(context.clone(), false).await?;
-            build::build_loader().await?;
-            start::start_loader().await?;
-            start::clear_cache_loader().await?;
+            build::generate_app_env_loader(context, false).await?;
+            build::build_loader(context).await?;
+            start::start_loader(context).await?;
+            start::clear_cache_loader(context).await?;
         }
 
         let previous_log = Logs {
@@ -47,24 +47,18 @@ impl CliCommand for Dev {
         };
         let mut last_logs: Option<DateTime<Utc>> = None;
 
-        let mut cmd_context = context;
-
         lenra::display_app_access_url();
         InteractiveCommand::Help.to_value();
         let mut interactive_cmd = None;
         loop {
             if let Some(command) = interactive_cmd {
-                let (ctx_opt, keep_running) = run_command(&command, cmd_context.clone()).await;
+                let keep_running = run_command(&command, context).await;
                 if !keep_running {
                     break;
                 }
-                if let Some(ctx) = ctx_opt {
-                    cmd_context = ctx.clone();
-                }
             }
             let end_date;
-            (end_date, interactive_cmd) =
-                run_logs(&previous_log, last_logs, cmd_context.clone()).await?;
+            (end_date, interactive_cmd) = run_logs(&previous_log, last_logs, context).await?;
             last_logs = Some(end_date);
         }
 
@@ -76,7 +70,7 @@ impl CliCommand for Dev {
 async fn run_logs(
     logs: &Logs,
     last_end: Option<DateTime<Utc>>,
-    context: CommandContext,
+    context: &mut CommandContext,
 ) -> Result<(DateTime<Utc>, Option<TerminalCommand>)> {
     let mut clone = logs.clone();
     if let Some(last_logs) = last_end {
diff --git a/src/cli/logs.rs b/src/cli/logs.rs
index 6217b13..36a9776 100644
--- a/src/cli/logs.rs
+++ b/src/cli/logs.rs
@@ -47,10 +47,10 @@ pub struct Logs {
 
 #[async_trait]
 impl CliCommand for Logs {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
         log::info!("Show logs");
 
-        let mut command = create_compose_command();
+        let mut command = create_compose_command(context);
 
         command
             .stdout(Stdio::inherit())
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 79b02b9..0be2e53 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1,10 +1,15 @@
-use std::future::Future;
+use std::{future::Future, path::PathBuf};
 
 use async_trait::async_trait;
 pub use clap::{Args, Parser, Subcommand};
 use loading::Loading;
+use log::debug;
 
-use crate::{config::DEFAULT_CONFIG_FILE, docker_compose::Service, errors::Result};
+use crate::{
+    config::{load_config_file, Application, DEFAULT_CONFIG_FILE},
+    docker_compose::Service,
+    errors::Result,
+};
 
 use self::{
     build::Build, check::Check, dev::Dev, logs::Logs, new::New, reload::Reload, start::Start,
@@ -45,7 +50,10 @@ pub struct Cli {
 
 #[async_trait]
 pub trait CliCommand {
-    async fn run(&self, context: CommandContext) -> Result<()>;
+    async fn run(&self, context: &mut CommandContext) -> Result<()>;
+    fn need_config(&self) -> bool {
+        true
+    }
 }
 
 /// The subcommands
@@ -75,8 +83,11 @@ pub enum Command {
 
 #[async_trait]
 impl CliCommand for Command {
-    async fn run(&self, context: CommandContext) -> Result<()> {
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
         log::debug!("Run command {:?}", self);
+        if self.need_config() {
+            context.load_config()?;
+        }
         match self {
             Command::New(new) => new.run(context),
             Command::Build(build) => build.run(context),
@@ -91,12 +102,22 @@ impl CliCommand for Command {
         }
         .await
     }
+
+    fn need_config(&self) -> bool {
+        match self {
+            Command::New(_) => false,
+            _ => true,
+        }
+    }
 }
 
 #[derive(Clone, Debug, Default)]
 pub struct CommandContext {
     /// The app configuration file.
-    pub config: std::path::PathBuf,
+    pub config_path: std::path::PathBuf,
+
+    /// The app configuration.
+    pub config: Option<Application>,
 
     /// Exposes all services ports.
     pub expose: Vec<Service>,
@@ -105,6 +126,38 @@ pub struct CommandContext {
     pub verbose: bool,
 }
 
+impl CommandContext {
+    pub fn load_config(&mut self) -> Result<Application> {
+        debug!("Load config from {:?}", self.config_path);
+        let app: Application = load_config_file(&self.config_path)?;
+        self.config = Some(app.clone());
+        Ok(app)
+    }
+
+    /// Resolve a path relative to the current directory and base on the path property of the config.
+    pub fn resolve_path(&self, path: &PathBuf) -> PathBuf {
+        let mut resolved_path = self.get_app_workdir();
+        resolved_path.push(path);
+        debug!("Resolved path {:?} to {:?}", path, resolved_path);
+        resolved_path
+    }
+
+    pub fn get_app_workdir(&self) -> PathBuf {
+        let mut workdir = self.config_path.clone();
+        workdir.pop();
+        if let Some(app_dir_path) = self.get_app_path_config() {
+            workdir.push(app_dir_path);
+        };
+        workdir
+    }
+
+    fn get_app_path_config(&self) -> Option<PathBuf> {
+        self.config
+            .as_ref()
+            .map(|app| app.path.clone().unwrap_or(PathBuf::from(".")))
+    }
+}
+
 pub async fn loader<F, Fut, R>(text: &str, success: &str, fail: &str, task: F) -> Result<R>
 where
     F: FnOnce() -> Fut,
@@ -124,9 +177,11 @@ where
 
 #[cfg(test)]
 mod test {
+    use std::path::PathBuf;
+
     use clap::{CommandFactory, FromArgMatches};
 
-    use super::Cli;
+    use super::*;
 
     pub fn parse_command_line(line: String) -> Result<Cli, clap::Error> {
         let args = &mut line.split_whitespace().collect::<Vec<&str>>();
@@ -142,4 +197,127 @@ mod test {
         let mut command = <Cli as CommandFactory>::command();
         err.format(&mut command)
     }
+
+    #[test]
+    fn test_load_config() {
+        let mut context = CommandContext::default();
+        context.config_path = PathBuf::from("test/config/app_path.yml");
+        let app = context.load_config().unwrap();
+        assert_eq!(app.path, Some(PathBuf::from("test_app")));
+    }
+
+    macro_rules! resolve_path_tests {
+        ($($name:ident: $value:expr,)*) => {
+        mod resolve_path {
+            use std::path::PathBuf;
+            use super::super::*;
+        $(
+            #[test]
+            fn $name() {
+                let (config_path, config, expected) = $value;
+                let mut context = CommandContext::default();
+                context.config_path = PathBuf::from(config_path);
+                context.config = config;
+                let path = PathBuf::from(".lenra/compose.yml");
+                let resolved_path = context.resolve_path(&path);
+                assert_eq!(
+                    resolved_path,
+                    PathBuf::from(expected)
+                );
+            }
+        )*
+        }
+        }
+    }
+
+    resolve_path_tests! {
+        simple: (
+            "",
+            Some(Application {..Default::default()}),
+            "./.lenra/compose.yml"
+        ),
+        app_path: (
+            "",
+            Some(Application {path: Some(PathBuf::from("test_app")), ..Default::default()}),
+            "test_app/.lenra/compose.yml"
+        ),
+        app_path_and_config_file: (
+            "test/config/lenra.yml",
+            Some(Application {path: Some(PathBuf::from("test_app")), ..Default::default()}),
+            "test/config/test_app/.lenra/compose.yml"
+        ),
+        app_path_in_parent_dir: (
+            "",
+            Some(Application {path: Some(PathBuf::from("../test_app")), ..Default::default()}),
+            "../test_app/.lenra/compose.yml"
+        ),
+        app_path_in_parent_dir_and_config_file: (
+            "test/config/lenra.yml",
+            Some(Application {path: Some(PathBuf::from("../test_app")), ..Default::default()}),
+            "test/config/../test_app/.lenra/compose.yml"
+        ),
+    }
+
+    macro_rules! get_app_workdir_tests {
+        ($($name:ident: $value:expr,)*) => {
+        mod get_app_workdir {
+            use std::path::PathBuf;
+            use super::super::*;
+        $(
+            #[test]
+            fn $name() {
+                let (config_path, config, expected) = $value;
+                let mut context = CommandContext::default();
+                context.config_path = PathBuf::from(config_path);
+                context.config = config;
+                let workdir = context.get_app_workdir();
+                assert_eq!(
+                    workdir,
+                    PathBuf::from(expected)
+                );
+            }
+        )*
+        }
+        }
+    }
+
+    get_app_workdir_tests! {
+        simple: (
+            "",
+            Some(Application {..Default::default()}),
+            "."
+        ),
+        app_path: (
+            "",
+            Some(Application {path: Some(PathBuf::from("test_app")), ..Default::default()}),
+            "test_app"
+        ),
+        app_path_and_config_file: (
+            "test/config/lenra.yml",
+            Some(Application {path: Some(PathBuf::from("test_app")), ..Default::default()}),
+            "test/config/test_app"
+        ),
+        app_path_in_parent_dir: (
+            "",
+            Some(Application {path: Some(PathBuf::from("../test_app")), ..Default::default()}),
+            "../test_app"
+        ),
+        app_path_in_parent_dir_and_config_file: (
+            "test/config/lenra.yml",
+            Some(Application {path: Some(PathBuf::from("../test_app")), ..Default::default()}),
+            "test/config/../test_app"
+        ),
+    }
+
+    #[test]
+    fn test_get_app_path_config() {
+        let mut context = CommandContext::default();
+        let app = Application {
+            path: Some(PathBuf::from("test_app")),
+            ..Default::default()
+        };
+        context.config = Some(app);
+        let app_path = context.get_app_path_config().unwrap();
+        assert_eq!(app_path, PathBuf::from("test_app"));
+    }
 }
diff --git a/src/cli/new.rs b/src/cli/new.rs
index ada4189..d30eb30 100644
--- a/src/cli/new.rs
+++ b/src/cli/new.rs
@@ -26,7 +26,7 @@ pub struct New {
 
 #[async_trait]
 impl CliCommand for New {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
+    async fn run(&self, _context: &mut CommandContext) -> Result<()> {
         log::debug!("topics {:?}", self.topics);
 
         let template =
@@ -100,7 +100,7 @@ mod tests {
             MockResult::Return(Box::pin(async move { Ok(vec![]) }))
         });
         let result = new
-            .run(CommandContext {
+            .run(&mut CommandContext {
                 ..Default::default()
             })
             .await;
@@ -152,7 +152,7 @@ mod tests {
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
         let result = new
-            .run(CommandContext {
+            .run(&mut CommandContext {
                 ..Default::default()
             })
             .await;
@@ -214,7 +214,7 @@ mod tests {
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
         let result = new
-            .run(CommandContext {
+            .run(&mut CommandContext {
                 ..Default::default()
             })
             .await;
@@ -245,7 +245,7 @@ mod tests {
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
         let result = new
-            .run(CommandContext {
+            .run(&mut CommandContext {
                 ..Default::default()
             })
             .await;
@@ -275,7 +275,7 @@ mod tests {
             MockResult::Return(Box::pin(async move { Ok(()) }))
         });
         let result = new
-            .run(CommandContext {
+            .run(&mut CommandContext {
                 ..Default::default()
             })
             .await;
diff --git a/src/cli/reload.rs b/src/cli/reload.rs
index 0e371b9..bf53d7e 100644
--- a/src/cli/reload.rs
+++ b/src/cli/reload.rs
@@ -15,10 +15,10 @@ pub struct Reload;
 
 #[async_trait]
 impl CliCommand for Reload {
-    async fn run(&self, context: CommandContext) -> Result<()> {
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
         generate_app_env_loader(context, false).await?;
-        build_loader().await?;
-        start_loader().await?;
-        clear_cache_loader().await
+        build_loader(context).await?;
+        start_loader(context).await?;
+        clear_cache_loader(context).await
     }
 }
diff --git a/src/cli/start.rs b/src/cli/start.rs
index d500c17..df9cbf8 100644
--- a/src/cli/start.rs
+++ b/src/cli/start.rs
@@ -12,30 +12,30 @@ pub struct Start;
 
 #[async_trait]
 impl CliCommand for Start {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
-        start_loader().await?;
-        clear_cache_loader().await?;
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
+        start_loader(context).await?;
+        clear_cache_loader(context).await?;
         lenra::display_app_access_url();
         Ok(())
     }
 }
 
-pub async fn start_loader() -> Result<()> {
+pub async fn start_loader(context: &mut CommandContext) -> Result<()> {
     loader(
         "Start app environment...",
         "App environment started",
         "Failed starting app",
-        || async { lenra::start_env().await },
+        || async { lenra::start_env(context).await },
     )
     .await
 }
 
-pub async fn clear_cache_loader() -> Result<()> {
+pub async fn clear_cache_loader(context: &mut CommandContext) -> Result<()> {
     loader(
         "Clearing cache...",
         "Cache cleared",
         "Failed clearing cache",
-        || async { lenra::clear_cache().await },
+        || async { lenra::clear_cache(context).await },
     )
     .await
 }
diff --git a/src/cli/stop.rs b/src/cli/stop.rs
index 7d151cb..e690b9d 100644
--- a/src/cli/stop.rs
+++ b/src/cli/stop.rs
@@ -12,17 +12,17 @@ pub struct Stop;
 
 #[async_trait]
 impl CliCommand for Stop {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
-        stop_loader().await
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
+        stop_loader(context).await
     }
 }
 
-pub async fn stop_loader() -> Result<()> {
+pub async fn stop_loader(context: &mut CommandContext) -> Result<()> {
     loader(
         "Stop app environment...",
         "App environment stopped",
         "Failed stopping app environment",
-        || async { lenra::stop_env().await },
+        || async { lenra::stop_env(context).await },
     )
     .await
 }
diff --git a/src/cli/terminal.rs b/src/cli/terminal.rs
index 6051b4f..8d34d20 100644
--- a/src/cli/terminal.rs
+++ b/src/cli/terminal.rs
@@ -24,7 +24,7 @@ const LENRA_COMMAND: &str = "lenra";
 const READLINE_PROMPT: &str = "[lenra]$ ";
 // const ESCAPE_EVENT: KeyEvent = KeyEvent(KeyCode::Esc, Modifiers::NONE);
 
-pub async fn start_terminal(context: CommandContext) -> Result<()> {
+pub async fn start_terminal(context: &mut CommandContext) -> Result<()> {
     let history_path = config_dir()
         .ok_or(Error::Custom("Can't get the user config directory".into()))?
         .join("lenra")
@@ -36,8 +36,6 @@ pub async fn start_terminal(context: CommandContext) -> Result<()> {
         debug!("No previous history.");
     }
 
-    let mut context = context.clone();
-
     loop {
         let readline = rl.readline(READLINE_PROMPT);
         let command = match readline {
@@ -77,33 +75,26 @@ pub async fn start_terminal(context: CommandContext) -> Result<()> {
         };
 
         debug!("Run command {:#?}", command);
-        let (ctx_opt, keep_running) = run_command(&command, context.clone()).await;
+        let keep_running = run_command(&command, context).await;
         if !keep_running {
             break;
         }
-        if let Some(ctx) = ctx_opt {
-            context = ctx.clone();
-        }
     }
     debug!("Save history to {:?}", history_path);
     fs::create_dir_all(history_path.parent().unwrap())?;
     rl.save_history(&history_path).map_err(Error::from)
 }
 
-pub async fn run_command(
-    command: &TerminalCommand,
-    context: CommandContext,
-) -> (Option<CommandContext>, bool) {
+pub async fn run_command(command: &TerminalCommand, context: &mut CommandContext) -> bool {
     debug!("Run command {:#?}", command);
-    let context = command.run(context).await.unwrap_or_else(|error| {
+    command.run(context).await.unwrap_or_else(|error| {
         eprintln!("{}", error.to_string().color(Color::Red));
-        None
     });
     let keep_running = match command {
         TerminalCommand::Exit | TerminalCommand::Stop(_) => false,
         _ => true,
     };
-    (context, keep_running)
+    keep_running
 }
 
 fn parse_command_line(line: String) -> Result<TerminalCli, clap::Error> {
@@ -174,17 +165,18 @@ pub struct Expose {
 }
 
 impl TerminalCommand {
-    pub async fn run(&self, context: CommandContext) -> Result<Option<CommandContext>> {
+    pub async fn run(&self, context: &mut CommandContext) -> Result<()> {
         log::debug!("Run terminal command {:?}", self);
+        if self.need_config_reload() {
+            context.load_config()?;
+        }
         match self {
             TerminalCommand::Exit => {}
             TerminalCommand::Expose(expose) => {
-                lenra::generate_app_env(&context.config, &expose.services, false).await?;
-                lenra::start_env().await?;
+                lenra::generate_app_env(context, false).await?;
+                lenra::start_env(context).await?;
 
-                let mut ctx = context.clone();
-                ctx.expose = expose.services.clone();
-                return Ok(Some(ctx));
+                context.expose = expose.services.clone();
             }
             TerminalCommand::Build(build) => build.run(context).await?,
             TerminalCommand::Start(start) => start.run(context).await?,
@@ -196,6 +188,16 @@ impl TerminalCommand {
             TerminalCommand::Check(check) => check.run(context).await?,
             TerminalCommand::Reload(reload) => reload.run(context).await?,
         };
-        Ok(None)
+        Ok(())
+    }
+
+    fn need_config_reload(&self) -> bool {
+        match self {
+            TerminalCommand::Build(_)
+            | TerminalCommand::Start(_)
+            | TerminalCommand::Reload(_)
+            | TerminalCommand::Update(_) => true,
+            _ => false,
+        }
     }
 }
diff --git a/src/cli/update.rs b/src/cli/update.rs
index 8c3f589..e48750c 100644
--- a/src/cli/update.rs
+++ b/src/cli/update.rs
@@ -17,17 +17,17 @@ pub struct Update {
 
 #[async_trait]
 impl CliCommand for Update {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
-        update_loader(&self.services).await
+    async fn run(&self, context: &mut CommandContext) -> Result<()> {
+        update_loader(context, &self.services).await
     }
 }
 
-pub async fn update_loader(services: &Vec<Service>) -> Result<()> {
+pub async fn update_loader(context: &mut CommandContext, services: &Vec<Service>) -> Result<()> {
     loader(
         "Update environment images...",
         "Environment images updated",
         "Failed updating environment images",
-        || async { lenra::update_env_images(services).await },
+        || async { lenra::update_env_images(context, services).await },
     )
     .await
 }
diff --git a/src/cli/upgrade.rs b/src/cli/upgrade.rs
index 8ef1122..9715199 100644
--- a/src/cli/upgrade.rs
+++ b/src/cli/upgrade.rs
@@ -12,7 +12,7 @@ pub struct Upgrade;
 
 #[async_trait]
 impl CliCommand for Upgrade {
-    async fn run(&self, _context: CommandContext) -> Result<()> {
+    async fn run(&self, _context: &mut CommandContext) -> Result<()> {
         lenra::upgrade_app().await
     }
 }
diff --git a/src/config.rs b/src/config.rs
index c9cb61b..667f84e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -8,7 +8,8 @@ use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
 
 use crate::{
-    docker_compose::{generate_docker_compose, Service},
+    cli::CommandContext,
+    docker_compose::generate_docker_compose,
     errors::{Error, Result},
 };
 
@@ -17,7 +18,7 @@ pub const LENRA_CACHE_DIRECTORY: &str = ".lenra";
 
 pub const DOCKERFILE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "Dockerfile"];
 pub const DOCKERIGNORE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "Dockerfile.dockerignore"];
-pub const DOCKERCOMPOSE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "docker-compose.yml"];
+pub const DOCKERCOMPOSE_DEFAULT_PATH: [&str; 2] = [LENRA_CACHE_DIRECTORY, "compose.yml"];
 
 pub const OF_WATCHDOG_BUILDER: &str = "of-watchdog";
 pub const OF_WATCHDOG_IMAGE: &str = "ghcr.io/openfaas/of-watchdog";
@@ -45,11 +46,10 @@ pub fn load_config_file(path: &std::path::PathBuf) -> Result<Application> {
 }
 
 /** The main component of the config file */
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Application {
-    #[serde(rename = "componentsApi")]
-    pub components_api: String,
+    pub path: Option<PathBuf>,
     pub generator: Generator,
     pub dev: Option<Dev>,
 }
@@ -78,7 +78,7 @@ pub struct DebugDofigen {
 }
 
 /** The application generator configuration */
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 #[serde(untagged)]
 pub enum Generator {
     Dofigen(Dofigen),
@@ -90,49 +90,52 @@ pub enum Generator {
 }
 
 /** The Dofigen configuration */
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 pub struct Dofigen {
     pub dofigen: dofigen_lib::Image,
 }
 
 /** The Dofigen configuration file */
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 pub struct DofigenFile {
     pub dofigen: std::path::PathBuf,
 }
 
 /** The Docker configuration */
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 pub struct Docker {
     pub docker: String,
     pub ignore: Option<String>,
 }
 
 /** The Docker configuration file */
-#[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 pub struct Dockerfile {
     pub docker: std::path::PathBuf,
 }
 
 impl Application {
     /// Generates all the files needed to build and run the application
-    pub async fn generate_files(&self, exposed_services: &Vec<Service>, debug: bool) -> Result<()> {
-        self.generate_docker_files(debug)?;
-        self.generate_docker_compose_file(exposed_services, debug)
-            .await?;
+    pub async fn generate_files(&self, context: &mut CommandContext, debug: bool) -> Result<()> {
+        self.generate_docker_files(context, debug)?;
+        self.generate_docker_compose_file(context, debug).await?;
         Ok(())
     }
 
-    pub fn generate_docker_files(&self, debug: bool) -> Result<()> {
+    pub fn generate_docker_files(&self, context: &mut CommandContext, debug: bool) -> Result<()> {
         log::info!("Docker files generation");
         // create the `.lenra` cache directory
-        fs::create_dir_all(LENRA_CACHE_DIRECTORY).unwrap();
+        fs::create_dir_all(context.resolve_path(&PathBuf::from(LENRA_CACHE_DIRECTORY))).unwrap();
 
         match &self.generator {
             // If args '--prod' is passed then not debug
-            Generator::Dofigen(dofigen) => self.build_dofigen(dofigen.dofigen.clone(), debug),
+            Generator::Dofigen(dofigen) => {
+                self.build_dofigen(context, dofigen.dofigen.clone(), debug)
+            }
             Generator::DofigenFile(dofigen_file) => self.build_dofigen(
-                from_file_path(&dofigen_file.dofigen).map_err(Error::from)?,
+                context,
+                from_file_path(&context.resolve_path(&dofigen_file.dofigen))
+                    .map_err(Error::from)?,
                 debug,
             ),
             Generator::DofigenError { dofigen: _ } => Err(Error::Custom(
@@ -140,7 +143,7 @@ impl Application {
             )),
             Generator::Dockerfile(_dockerfile) => Ok(()),
             Generator::Docker(docker) => {
-                self.save_docker_content(docker.docker.clone(), docker.ignore.clone())
+                self.save_docker_content(context, docker.docker.clone(), docker.ignore.clone())
             }
             Generator::Unknow => Err(Error::Custom("Not managed generator".into())),
         }
@@ -148,27 +151,33 @@ impl Application {
 
     pub async fn generate_docker_compose_file(
         &self,
-        exposed_services: &Vec<Service>,
+        context: &mut CommandContext,
         debug: bool,
     ) -> Result<()> {
         log::info!("Docker Compose file generation");
         // create the `.lenra` cache directory
-        fs::create_dir_all(LENRA_CACHE_DIRECTORY).map_err(Error::from)?;
+        fs::create_dir_all(context.resolve_path(&PathBuf::from(LENRA_CACHE_DIRECTORY)))
+            .map_err(Error::from)?;
 
         let dockerfile: PathBuf = if let Generator::Dockerfile(file_conf) = &self.generator {
-            file_conf.docker.clone()
+            context.resolve_path(&file_conf.docker.clone())
         } else {
-            DOCKERFILE_DEFAULT_PATH.iter().collect()
+            context.resolve_path(&DOCKERFILE_DEFAULT_PATH.iter().collect())
         };
 
-        generate_docker_compose(dockerfile, &self.dev, exposed_services, debug)
+        generate_docker_compose(context, dockerfile, &self.dev, debug)
             .await
             .map_err(Error::from)?;
         Ok(())
     }
 
     /// Builds a Docker image from a Dofigen structure
-    fn build_dofigen(&self, image: dofigen_lib::Image, debug: bool) -> Result<()> {
+    fn build_dofigen(
+        &self,
+        context: &mut CommandContext,
+        image: dofigen_lib::Image,
+        debug: bool,
+    ) -> Result<()> {
         // Generate the Dofigen config with OpenFaaS overlay to handle the of-watchdog
         let overlay = self.dofigen_of_overlay(image)?;
 
@@ -182,7 +191,7 @@ impl Application {
         // generate the Dockerfile and .dockerignore files with Dofigen
         let dockerfile = generate_dockerfile(&overlay);
         let dockerignore = generate_dockerignore(&overlay);
-        self.save_docker_content(dockerfile, Some(dockerignore))
+        self.save_docker_content(context, dockerfile, Some(dockerignore))
     }
 
     fn dofigen_debug_overlay(&self, image: dofigen_lib::Image) -> Result<dofigen_lib::Image> {
@@ -317,11 +326,14 @@ impl Application {
     /// Saves the Dockerfile and dockerignore (if present) files from their contents
     fn save_docker_content(
         &self,
+        context: &mut CommandContext,
         dockerfile_content: String,
         dockerignore_content: Option<String>,
     ) -> Result<()> {
-        let dockerfile_path: PathBuf = DOCKERFILE_DEFAULT_PATH.iter().collect();
-        let dockerignore_path: PathBuf = DOCKERIGNORE_DEFAULT_PATH.iter().collect();
+        let dockerfile_path: PathBuf =
+            context.resolve_path(&DOCKERFILE_DEFAULT_PATH.iter().collect());
+        let dockerignore_path: PathBuf =
+            context.resolve_path(&DOCKERIGNORE_DEFAULT_PATH.iter().collect());
 
         fs::write(dockerfile_path, dockerfile_content)?;
         if let Some(content) = dockerignore_content {
@@ -372,7 +384,6 @@ mod dofigen_of_overlay_tests {
             ..Default::default()
         };
         let config = Application {
-            components_api: "".to_string(),
             generator: Generator::Dofigen(Dofigen {
                 dofigen: image.clone(),
             }),
@@ -390,7 +401,6 @@ mod dofigen_of_overlay_tests {
             ..Default::default()
         };
         let config = Application {
-            components_api: "".to_string(),
             generator: Generator::Dofigen(Dofigen {
                 dofigen: image.clone(),
             }),
diff --git a/src/devtool.rs b/src/devtool.rs
index a8041e0..8efb0bc 100644
--- a/src/devtool.rs
+++ b/src/devtool.rs
@@ -1,14 +1,16 @@
 use log::debug;
 
 use crate::{
-    docker_compose::{execute_compose_service_command, DEVTOOL_SERVICE_NAME},
+    cli::CommandContext,
+    docker_compose::{execute_compose_service_command, Service},
     errors::Result,
 };
 
-pub async fn stop_app_env() -> Result<()> {
+pub async fn stop_app_env(context: &mut CommandContext) -> Result<()> {
     debug!("Stop app environment");
     execute_compose_service_command(
-        DEVTOOL_SERVICE_NAME,
+        context,
+        Service::Devtool,
         &[
             "bin/dev_tools",
             "rpc",
diff --git a/src/docker_compose.rs b/src/docker_compose.rs
index acb6661..3911bdb 100644
--- a/src/docker_compose.rs
+++ b/src/docker_compose.rs
@@ -11,6 +11,7 @@ use std::{convert::TryInto, env, fs, path::PathBuf};
 use strum::Display;
 use tokio::process;
 
+use crate::cli::CommandContext;
 use crate::command::{get_command_output, is_inherit_stdio};
 use crate::config::Image;
 use crate::docker::normalize_tag;
@@ -116,14 +117,14 @@ pub enum ServiceState {
 
 /// Generates the docker-compose.yml file
 pub async fn generate_docker_compose(
+    context: &mut CommandContext,
     dockerfile: PathBuf,
     dev_conf: &Option<Dev>,
-    exposed_services: &Vec<Service>,
     debug: bool,
 ) -> Result<()> {
     let compose_content =
-        generate_docker_compose_content(dockerfile, dev_conf, exposed_services, debug).await?;
-    let compose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+        generate_docker_compose_content(dockerfile, dev_conf, &context.expose, debug).await?;
+    let compose_path: PathBuf = context.resolve_path(&DOCKERCOMPOSE_DEFAULT_PATH.iter().collect());
     fs::write(compose_path, compose_content).map_err(Error::from)?;
     Ok(())
 }
@@ -329,8 +330,9 @@ fn port_to_port_binding(port: u16) -> String {
     format!("{}:{}", port, port)
 }
 
-pub fn create_compose_command() -> process::Command {
-    let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+pub fn create_compose_command(context: &mut CommandContext) -> process::Command {
+    let dockercompose_path: PathBuf =
+        context.resolve_path(&DOCKERCOMPOSE_DEFAULT_PATH.iter().collect());
     let mut cmd = process::Command::from(COMPOSE_COMMAND.clone());
     cmd.arg("-f").arg(dockercompose_path).kill_on_drop(true);
     if is_inherit_stdio() {
@@ -341,8 +343,8 @@ pub fn create_compose_command() -> process::Command {
     cmd
 }
 
-pub async fn compose_up() -> Result<()> {
-    let mut command = create_compose_command();
+pub async fn compose_up(context: &mut CommandContext) -> Result<()> {
+    let mut command = create_compose_command(context);
 
     command.arg("up").arg("-d").arg("--wait");
 
@@ -358,8 +360,8 @@ pub async fn compose_up() -> Result<()> {
     Ok(())
 }
 
-pub async fn compose_down() -> Result<()> {
-    let mut command = create_compose_command();
+pub async fn compose_down(context: &mut CommandContext) -> Result<()> {
+    let mut command = create_compose_command(context);
 
     command.arg("down").arg("--volumes");
 
@@ -372,8 +374,8 @@ pub async fn compose_down() -> Result<()> {
     Ok(())
 }
 
-pub async fn compose_build() -> Result<()> {
-    let mut command = create_compose_command();
+pub async fn compose_build(context: &mut CommandContext) -> Result<()> {
+    let mut command = create_compose_command(context);
     command.arg("build");
 
     // Use Buildkit to improve performance
@@ -391,12 +393,12 @@ pub async fn compose_build() -> Result<()> {
     Ok(())
 }
 
-pub async fn compose_pull(services: Vec<&str>) -> Result<()> {
+pub async fn compose_pull(context: &mut CommandContext, services: &Vec<Service>) -> Result<()> {
     log::debug!("Pulling services: {:?}", services);
-    let mut command = create_compose_command();
+    let mut command = create_compose_command(context);
     command.arg("pull");
     services.iter().for_each(|service| {
-        command.arg(service);
+        command.arg(service.to_str());
     });
 
     log::debug!("cmd: {:?}", command);
@@ -412,8 +414,8 @@ pub async fn compose_pull(services: Vec<&str>) -> Result<()> {
 }
 
 /// List all the current Docker Compose running services
-pub async fn list_running_services() -> Result<Vec<Service>> {
-    let mut command = create_compose_command();
+pub async fn list_running_services(context: &mut CommandContext) -> Result<Vec<Service>> {
+    let mut command = create_compose_command(context);
     command
         .arg("ps")
         .arg("--services")
@@ -437,8 +439,11 @@ pub async fn list_running_services() -> Result<Vec<Service>> {
 }
 
 /// Get the given Docker Compose service information
-pub async fn get_service_informations(service: Service) -> Result<ServiceInformations> {
-    let mut command = create_compose_command();
+pub async fn get_service_informations(
+    context: &mut CommandContext,
+    service: Service,
+) -> Result<ServiceInformations> {
+    let mut command = create_compose_command(context);
     let service_name = service.to_str();
     command
         .arg("ps")
@@ -452,8 +457,11 @@ pub async fn get_service_informations(service: Service) -> Result<ServiceInforma
 }
 
 /// Get the given Docker Compose service published port
-pub async fn get_service_published_ports(service: Service) -> Result<Vec<u16>> {
-    let infos = get_service_informations(service).await?;
+pub async fn get_service_published_ports(
+    context: &mut CommandContext,
+    service: Service,
+) -> Result<Vec<u16>> {
+    let infos = get_service_informations(context, service).await?;
     let ports = infos
         .publishers
         .iter()
@@ -463,10 +471,14 @@ pub async fn get_service_published_ports(service: Service) -> Result<Vec<u16>> {
     Ok(ports)
 }
 
-pub async fn execute_compose_service_command(service: &str, cmd: &[&str]) -> Result<String> {
-    let mut command = create_compose_command();
+pub async fn execute_compose_service_command(
+    context: &mut CommandContext,
+    service: Service,
+    cmd: &[&str],
+) -> Result<String> {
+    let mut command = create_compose_command(context);
 
-    command.arg("exec").arg(service);
+    command.arg("exec").arg(service.to_str());
 
     cmd.iter().for_each(|&part| {
         command.arg(part);
diff --git a/src/lenra.rs b/src/lenra.rs
index 027b99a..fb7ee88 100644
--- a/src/lenra.rs
+++ b/src/lenra.rs
@@ -7,8 +7,9 @@ use std::{
 use rustyline::Editor;
 
 use crate::{
+    cli::CommandContext,
     command::get_command_output,
-    config::{load_config_file, DOCKERCOMPOSE_DEFAULT_PATH, LENRA_CACHE_DIRECTORY},
+    config::{DOCKERCOMPOSE_DEFAULT_PATH, LENRA_CACHE_DIRECTORY},
     devtool::stop_app_env,
     docker_compose::{
         self, compose_build, compose_down, compose_up, list_running_services, Service,
@@ -61,50 +62,50 @@ fn create_cache_directories(path: &PathBuf, git_dir: &PathBuf) -> Result<()> {
     Ok(())
 }
 
-pub async fn generate_app_env(
-    config: &PathBuf,
-    expose: &Vec<Service>,
-    production: bool,
-) -> Result<()> {
+pub async fn generate_app_env(context: &mut CommandContext, production: bool) -> Result<()> {
     log::info!("Generating the app environment");
-    let conf = load_config_file(config)?;
+    let conf = context
+        .config
+        .clone()
+        .ok_or(Error::Custom("The config is missing".into()))?;
     // TODO: check the components API version
 
-    conf.generate_files(expose, !production).await?;
+    conf.generate_files(context, !production).await?;
     Ok(())
 }
 
-pub async fn build_app() -> Result<()> {
+pub async fn build_app(context: &mut CommandContext) -> Result<()> {
     log::info!("Build the Docker image");
-    compose_build().await?;
+    compose_build(context).await?;
     log::info!("Image built");
     Ok(())
 }
 
-pub async fn start_env() -> Result<()> {
-    let dockercompose_path: PathBuf = DOCKERCOMPOSE_DEFAULT_PATH.iter().collect();
+pub async fn start_env(context: &mut CommandContext) -> Result<()> {
+    let dockercompose_path: PathBuf =
+        context.resolve_path(&DOCKERCOMPOSE_DEFAULT_PATH.iter().collect());
     if !dockercompose_path.exists() {
         return Err(Error::NeverBuiltApp);
     }
 
     log::info!("Start the containers");
-    compose_up().await?;
-    let running_services: Vec<Service> = list_running_services().await?;
+    compose_up(context).await?;
+    let running_services: Vec<Service> = list_running_services(context).await?;
     if running_services.len() < 4 {
         return Err(Error::NotStartedServices);
     }
     Ok(())
 }
 
-pub async fn stop_env() -> Result<()> {
+pub async fn stop_env(context: &mut CommandContext) -> Result<()> {
     log::info!("Stop the containers");
-    compose_down().await?;
+    compose_down(context).await?;
     Ok(())
 }
 
-pub async fn clear_cache() -> Result<()> {
+pub async fn clear_cache(context: &mut CommandContext) -> Result<()> {
     log::info!("Clearing cache");
-    stop_app_env().await?;
+    stop_app_env(context).await?;
     Ok(())
 }
 
@@ -115,9 +116,12 @@ pub fn display_app_access_url() {
     );
 }
 
-pub async fn update_env_images(services: &Vec<Service>) -> Result<()> {
+pub async fn update_env_images(
+    context: &mut CommandContext,
+    services: &Vec<Service>,
+) -> Result<()> {
     log::info!("Update the environment images");
-    docker_compose::compose_pull(services.iter().map(|service| service.to_str()).collect()).await?;
+    docker_compose::compose_pull(context, services).await?;
     Ok(())
 }
 
diff --git a/src/main.rs b/src/main.rs
index 4b43429..e1d10b4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,9 +24,10 @@ mod template;
 async fn main() -> () {
     env_logger::init();
     let args = Cli::parse();
-    let context = CommandContext {
-        config: args.config.clone(),
-        expose: args.expose.clone(),
+    let context = &mut CommandContext {
+        config_path: args.config,
+        config: None,
+        expose: args.expose,
         verbose: args.verbose,
     };
     if args.verbose {
diff --git a/test/config/app_path.yml b/test/config/app_path.yml
new file mode 100644
index 0000000..a489dd1
--- /dev/null
+++ b/test/config/app_path.yml
@@ -0,0 +1,4 @@
+path: test_app
+generator:
+  dofigen:
+    from: scratch
\ No newline at end of file

From ffeefb0dad2ba1443b71100c3de37fa185b4a2f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:18:35 +0000
Subject: [PATCH 76/76] build(deps): bump clap from 3.2.25 to 4.4.4

Bumps [clap](https://github.com/clap-rs/clap) from 3.2.25 to 4.4.4.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v3.2.25...v4.4.4)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 155 +++++++++++++++++++++++++----------------------------
 Cargo.toml |   2 +-
 2 files changed, 75 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 651a9ec..f4715e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,6 +41,54 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.72"
@@ -52,17 +100,6 @@ dependencies = [
  "syn 2.0.27",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -143,42 +180,43 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.25"
+version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
 dependencies = [
- "atty",
- "bitflags 1.3.2",
+ "clap_builder",
  "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
+dependencies = [
+ "anstream",
+ "anstyle",
  "clap_lex",
- "indexmap 1.9.3",
- "once_cell",
  "strsim",
- "termcolor",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.25"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.27",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
 
 [[package]]
 name = "clipboard-win"
@@ -191,6 +229,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "colored"
 version = "2.0.4"
@@ -583,15 +627,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.2"
@@ -670,7 +705,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi",
  "rustix",
  "windows-sys",
 ]
@@ -850,7 +885,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi",
  "libc",
 ]
 
@@ -875,12 +910,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
-[[package]]
-name = "os_str_bytes"
-version = "6.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -922,30 +951,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.66"
@@ -1348,12 +1353,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thiserror"
 version = "1.0.44"
@@ -1511,12 +1510,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
diff --git a/Cargo.toml b/Cargo.toml
index 8af0308..34480b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ name = "lenra"
 path = "src/main.rs"
 
 [dependencies]
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.4", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9.19"