small adjustments

Author: GabrielSalla

.dockerignore

@@ -1,4 +1,14 @@
-**/__pycache__
-**/.mypy_cache
-**/.pytest_cache
 _monitors
+_monitors_load
+.coverage
+.git
+.mypy_cache
+.pytest_cache
+.ruff_cache
+.vscode
+**/__pycache__
+**/*.pyc
+**/*.pyd
+**/*.pyo
+docs
+tmp

.gitignore

@@ -1,6 +1,8 @@
 _monitors
 _monitors_load
 .coverage
+.mypy_cache
+.pytest_cache
 .ruff_cache
 .vscode
 **/__pycache__

Dockerfile

@@ -1,21 +1,47 @@
-FROM python:3.12-alpine AS sentinela
+ARG PYTHON_VERSION=3.12
 
+# Base image
+FROM python:${PYTHON_VERSION}-alpine AS base
+
+ARG SENTINELA_PLUGINS
 ENV VIRTUAL_ENV=/opt/venv \
     PATH="/opt/venv/bin:$PATH"
 
 WORKDIR /app
+COPY . /app/
 
 RUN python3 -m venv $VIRTUAL_ENV \
-    && pip install --upgrade pip \
-    && pip install poetry --no-cache-dir
+    && pip install --no-cache-dir --upgrade pip \
+    && pip install poetry --no-cache-dir \
+    && poetry install --only $(python ./tools/get_plugins_list.py) \
+    && find . -type d -name __pycache__ | xargs -n1 rm -r
 
-COPY . /app/
 
-RUN poetry install --no-root --only $(python ./tools/get_plugins_list.py) \
-    && poetry cache clear --no-interaction --all .
+# Sentinela image
+FROM python:${PYTHON_VERSION}-alpine AS sentinela
+
+ENV VIRTUAL_ENV=/opt/venv \
+    PATH="/opt/venv/bin:$PATH"
+
+WORKDIR /app
+
+COPY --from=base /app /app
+COPY --from=base /opt /opt
 
 
-FROM sentinela AS sentinela_dev
+# Base dev image
+FROM base AS base_dev
+
+RUN poetry install --only dev
+
+
+# Sentinela dev image
+FROM python:${PYTHON_VERSION}-alpine AS sentinela_dev
+
+ENV VIRTUAL_ENV=/opt/venv \
+    PATH="/opt/venv/bin:$PATH"
+
+WORKDIR /app
 
-RUN poetry install --no-root \
-    && poetry cache clear --no-interaction --all .
+COPY --from=base_dev /app /app
+COPY --from=base_dev /opt /opt

docker-compose-dev.yaml

@@ -22,6 +22,8 @@ services:
       context: .
       dockerfile: Dockerfile
       target: sentinela_dev
+      args:
+        SENTINELA_PLUGINS: slack
     image: sentinela-dev:latest
     ports:
       - 8000:8000
@@ -36,6 +38,10 @@ services:
       - .env.secrets
     volumes:
       - .:/app:Z
+      # Paths that won't be synced with the container
+      - /app/src/_monitors
+      - /app/src/_monitors_load
+      - /app/src/tmp
     depends_on:
       - postgres
       - motoserver

docker-compose-local.yaml

@@ -11,6 +11,8 @@ services:
       context: .
       dockerfile: Dockerfile
       target: sentinela
+      args:
+        SENTINELA_PLUGINS: slack
     image: sentinela-local:latest
     ports:
       - 8000:8000

pyproject.toml

@@ -1,15 +1,16 @@
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry]
+[project]
 name = "Sentinela"
 version = "0.3.2"
 description = "Sentinela Monitoring Platform"
-authors = ["Gabriel Salla <gabriel.c.salla@gmail.com>"]
-license = "MIT"
+authors = [
+    { name = "Gabriel Salla", email = "gabriel.c.salla@gmail.com" }
+]
+license = { file = "LICENSE.txt" }
 readme = "README.md"
 
+[tool.poetry]
+package-mode = false
+
 [tool.poetry.dependencies]
 python = "^3.12"
 aioboto3 = "^13.2.0"

tests/conftest.py

@@ -106,6 +106,7 @@ async def clear_database(init_databases):
 @pytest.fixture(scope="session", autouse=True)
 def _temp_dir(monkeypatch_session):
     """Create a temporary directory for all the tests that will be removed at the end"""
+    shutil.rmtree("src/tmp", ignore_errors=True)
     os.makedirs("src/tmp", exist_ok=True)
     monkeypatch_session.setattr(monitors_loader, "MONITORS_LOAD_PATH", "tmp")
     monkeypatch_session.setattr(module_loader.loader, "MODULES_PATH", "tmp")