diff --git a/service/Cargo.toml b/service/Cargo.toml index 30acc1d..dc880ca 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "service" -version = "0.2.6" +version = "0.2.7" edition = "2021" authors = ["Ben Sherriff "] repository = "https://github.com/bensherriff/siren" @@ -12,32 +12,32 @@ name = "siren" path = "src/lib.rs" [dependencies] -actix-web = "4.4.0" -actix-cors = "0.6.4" +actix-web = "4.5.1" +actix-cors = "0.7.0" actix-web-httpauth = "0.8.1" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.37", features = ["serde"] } dotenv = "0.15.0" -serde_json = "1.0.107" -log = "0.4.20" -env_logger = "0.10.0" +serde_json = "1.0.115" +log = "0.4.21" +env_logger = "0.11.3" diesel_migrations = { version = "2.1.0", features = ["postgres"] } r2d2 = "0.8.10" lazy_static = "1.4.0" -uuid = { version = "1.4.1", features = ["serde", "v4"] } -argon2 = "0.5.2" +uuid = { version = "1.8.0", features = ["serde", "v4"] } +argon2 = "0.5.3" redis = { version = "0.23.3", features = ["tokio-comp", "connection-manager", "r2d2"] } rust-s3 = "0.33.0" actix-multipart = "0.6.1" rand = "0.8.5" rand_chacha = "0.3.1" -jsonwebtoken = "9.2.0" +jsonwebtoken = "9.3.0" [dependencies.tokio] -version = "1.32.0" +version = "1.37.0" features = ["macros", "rt-multi-thread"] [dependencies.serde] -version = "1.0.188" +version = "1.0.197" features = ["derive"] [dependencies.reqwest] @@ -46,7 +46,7 @@ default-features = false features = ["json", "rustls-tls"] [dependencies.diesel] -version = "2.1.2" +version = "2.1.5" default-features = false features = ["postgres", "chrono", "32-column-tables", "serde_json", "r2d2", "with-deprecated"] diff --git a/service/Makefile b/service/Makefile index 2c90f5f..4210ff8 100644 --- a/service/Makefile +++ b/service/Makefile @@ -10,23 +10,26 @@ help: ## Help command @cat Makefile | grep -E '^[a-zA-Z\/_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @echo -build: ## Build the docker image - docker compose build +up: ## Start the backend containers + @docker compose --profile backend up -d -backend-up: ## Start the backend containers - docker compose --profile backend up -d +down: ## Stop the backend containers + @docker compose --profile backend down -backend-down: ## Stop the backend containers - docker compose --profile backend down +run: ## Run the app + @cargo run -up: ## Start the app - docker compose up -d +docker-up: ## Start the app + @docker compose --profile backend --profile siren up -d -down: ## Stop the app - docker compose down +docker-down: ## Stop the app + @docker compose --profile backend --profile siren down + +docker-build: ## Build the docker image + @docker compose build clean: ## Clean the app - docker compose down && \ + @docker compose down && \ docker image rm siren-service || \ docker network rm siren_frontend || \ docker network rm siren-backend diff --git a/ui/Makefile b/ui/Makefile index b1844a7..7a7cc81 100644 --- a/ui/Makefile +++ b/ui/Makefile @@ -13,10 +13,10 @@ build: ## Install the dependencies and build docker compose build up: ## Start the dev instance - docker compose up -d + docker compose --profile frontend up -d down: ## Stop the dev instance - docker compose down + docker compose --profile frontend down lint: ## Run the linter npm run lint diff --git a/ui/docker-compose.yml b/ui/docker-compose.yml index 0959ef0..ff5a3bc 100644 --- a/ui/docker-compose.yml +++ b/ui/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - name: siren services: ui: