diff --git a/service/.env b/service/.env index 5016f62..43cb6b1 100644 --- a/service/.env +++ b/service/.env @@ -1,7 +1,7 @@ RUST_LOG=warn,service=debug DATABASE_USER=siren -DATABASE_PASSWORD= # FILL ME IN +DATABASE_PASSWORD=CHANGEME # Change this to a secure password DATABASE_NAME=siren DATABASE_HOST=localhost DATABASE_PORT=5432 @@ -10,7 +10,7 @@ KEYS_DIR_PATH= # OPTIONAL SESSION_TTL=1440 MINIO_ROOT_USER=siren -MINIO_ROOT_PASSWORD= # FILL ME IN +MINIO_ROOT_PASSWORD=CHANGEME # Change this to a secure password MINIO_HOST=localhost MINIO_PORT=9000 MINIO_PORT_INTERNAL=9001 diff --git a/service/Cargo.toml b/service/Cargo.toml index dc880ca..2fe9797 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -31,10 +31,7 @@ actix-multipart = "0.6.1" rand = "0.8.5" rand_chacha = "0.3.1" jsonwebtoken = "9.3.0" - -[dependencies.tokio] -version = "1.37.0" -features = ["macros", "rt-multi-thread"] +tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] } [dependencies.serde] version = "1.0.197" diff --git a/service/Makefile b/service/Makefile index 61cdc3e..e60f7be 100644 --- a/service/Makefile +++ b/service/Makefile @@ -44,8 +44,9 @@ docker-down: ## Stop the app docker-build: ## Build the docker image @docker compose build -docker-clean: ## Clean the app - @docker compose down && \ - docker image rm siren-service || \ - docker network rm siren_frontend || \ - docker network rm siren-backend +docker-clean: ## Stop the docker containers and remove volumes + @echo "Stopping docker container and removing volumes..." + @docker-compose --profile backend --profile siren down -v + @echo "Docker container stopped and volumes removed" + +refresh: docker-clean up ## Refresh the docker containers \ No newline at end of file