organise files

Author: GabrielSalla

Dockerfile

@@ -3,6 +3,7 @@ ARG PYTHON_VERSION=3.12
 # Base image
 FROM python:${PYTHON_VERSION}-alpine AS base
 
+ARG CONFIGS_FILE
 ENV VIRTUAL_ENV=/opt/venv \
     PATH="/opt/venv/bin:$PATH"
 

Makefile

@@ -1,55 +1,55 @@
 # Development
 build-dev:
-	docker compose -f docker-compose-dev.yaml build sentinela-dev
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml build sentinela-dev
 
 pull-dev:
-	docker compose -f docker-compose-dev.yaml pull --quiet postgres motoserver
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml pull --quiet postgres motoserver
 
 migrate-dev:
-	docker compose -f docker-compose-dev.yaml run --rm --service-ports sentinela-dev alembic upgrade head
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml run --rm --service-ports sentinela-dev alembic upgrade head
 
 run-dev:
-	docker compose -f docker-compose-dev.yaml up sentinela-dev
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml up sentinela-dev
 
 run-shell-dev:
-	docker compose -f docker-compose-dev.yaml run --rm --service-ports sentinela-dev /bin/sh
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml run --rm --service-ports sentinela-dev /bin/sh
 
 test-dev:
-	docker compose -f docker-compose-dev.yaml run --rm sentinela-dev pytest
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml run --rm sentinela-dev pytest
 
 down-dev:
-	docker compose -f docker-compose-dev.yaml down
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml down
 
 # Local development setup
 build-local:
-	docker compose -f docker-compose-local.yaml build sentinela-local
+	docker compose --project-directory . -f ./docker/docker-compose-local.yaml build sentinela-local
 
 migrate-local:
-	docker compose -f docker-compose-local.yaml run --rm --service-ports sentinela-local alembic upgrade head
+	docker compose --project-directory . -f ./docker/docker-compose-local.yaml run --rm --service-ports sentinela-local alembic upgrade head
 
 run-local:
-	docker compose -f docker-compose-local.yaml up sentinela-local
+	docker compose --project-directory . -f ./docker/docker-compose-local.yaml up sentinela-local
 
 down-local:
-	docker compose -f docker-compose-local.yaml down
+	docker compose --project-directory . -f ./docker/docker-compose-local.yaml down
 
 # Scalable setup for production-like environment
 build-scalable:
-	docker compose -f docker-compose-scalable.yaml build sentinela-controller
+	docker compose --project-directory . -f ./docker/docker-compose-scalable.yaml build sentinela-controller
 
 migrate-scalable:
-	docker compose -f docker-compose-scalable.yaml run --rm --service-ports sentinela-controller alembic upgrade head
+	docker compose --project-directory . -f ./docker/docker-compose-scalable.yaml run --rm --service-ports sentinela-controller alembic upgrade head
 
 run-scalable:
-	docker compose -f docker-compose-scalable.yaml up sentinela-controller sentinela-executor
+	docker compose --project-directory . -f ./docker/docker-compose-scalable.yaml up sentinela-controller sentinela-executor
 
 down-scalable:
-	docker compose -f docker-compose-scalable.yaml down
+	docker compose --project-directory . -f ./docker/docker-compose-scalable.yaml down
 
 # Development utilities
 linter:
-	docker compose -f docker-compose-dev.yaml run --rm --no-deps sentinela-dev ruff check
-	docker compose -f docker-compose-dev.yaml run --rm --no-deps sentinela-dev ruff format --check --diff
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml run --rm --no-deps sentinela-dev ruff check
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml run --rm --no-deps sentinela-dev ruff format --check --diff
 
 mypy:
-	docker compose -f docker-compose-dev.yaml run --rm --no-deps sentinela-dev mypy --install-types --non-interactive
+	docker compose --project-directory . -f ./docker/docker-compose-dev.yaml run --rm --no-deps sentinela-dev mypy --install-types --non-interactive

configs-scalable.yaml renamed to configs/configs-scalable.yaml

@@ -22,10 +22,13 @@ services:
       context: .
       dockerfile: Dockerfile
       target: sentinela_dev
+      args:
+        CONFIGS_FILE: configs/configs.yaml
     image: sentinela-dev:latest
     ports:
       - 8000:8000
     environment:
+      CONFIGS_FILE: configs/configs.yaml
       SAMPLE_SLACK_CHANNEL: C07NCL94SDT
       SAMPLE_SLACK_MENTION: U07NFGGMB98
       SLACK_WEBSOCKET_ENABLED: true

configs.yaml renamed to configs/configs.yaml

@@ -11,6 +11,8 @@ services:
       context: .
       dockerfile: Dockerfile
       target: sentinela
+      args:
+        CONFIGS_FILE: configs/configs.yaml
     image: sentinela-local:latest
     ports:
       - 8000:8000
@@ -21,6 +23,7 @@ services:
       retries: 3
       start_period: 2s
     environment:
+      CONFIGS_FILE: configs/configs.yaml
       SAMPLE_SLACK_CHANNEL: C07NCL94SDT
       SAMPLE_SLACK_MENTION: U07NFGGMB98
       SLACK_WEBSOCKET_ENABLED: true

docker-compose-dev.yaml renamed to docker/docker-compose-dev.yaml

@@ -22,6 +22,8 @@ services:
       context: .
       dockerfile: Dockerfile
       target: sentinela
+      args:
+        CONFIGS_FILE: configs/configs-scalable.yaml
     image: sentinela-scalable:latest
     ports:
       - 8000:8000
@@ -50,6 +52,8 @@ services:
       context: .
       dockerfile: Dockerfile
       target: sentinela
+      args:
+        CONFIGS_FILE: configs/configs-scalable.yaml
     image: sentinela-scalable:latest
     deploy:
       mode: replicated

docker-compose-local.yaml renamed to docker/docker-compose-local.yaml

@@ -74,7 +74,7 @@ For a more scalable deployment, it is recommended to use separate containers for
 - Hard to monitor the application.
 - Running the database locally increases the risk of data loss.
 
-1. Set the `replicas` parameter in the `docker-compose-scalable.yml` file to the desired number of executors.
+1. Set the `replicas` parameter in the `docker/docker-compose-scalable.yml` file to the desired number of executors.
 2. Set the secrets in the `.env.secrets` file, as specified in the [Configuration](./configuration.md) documentation.
 3. Migrate the database to the latest version. This is only necessary when running for the first time or after updates.
     ```shell