Rework dev containers + Poetry update #1594

.dockerignore

@@ -1,5 +1,4 @@
 /.git/
 /.github/
-/src/.venv
 Containerfile
 compose.yml

provisioning/container/Containerfile-dev

@@ -6,8 +6,8 @@ ARG PYTHON_VERSION="3.12"
 
 FROM python:${PYTHON_VERSION}-alpine AS local-dsmrreader-base
 WORKDIR /app
-ENV PYTHONDONTWRITEBYTECODE=1
-ENV PYTHONUNBUFFERED=1
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
 RUN apk add --update \
     build-base \
     gcc \
@@ -17,19 +17,32 @@ RUN apk add --update \
     openjpeg \
     mariadb-dev \
     postgresql-client
+RUN pip install pip --upgrade
+
 
 
 FROM local-dsmrreader-base AS local-dsmrreader-dev
-# The only reason for .venv is the IDE's detection
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
-RUN pip install poetry
-COPY ./src/ /app/
-RUN poetry install --with dev --no-root
+ARG POETRY_VERSION="1.8.4"
+# Credits to https://www.martinrichards.me/post/python_poetry_docker/
+# Also, the only reason for .venv is the IDE's detection
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_VIRTUALENVS_CREATE=1 \
+    POETRY_CACHE_DIR=/tmp/poetry_cache
+RUN pip install poetry==${POETRY_VERSION}
+
+COPY src/pyproject.toml src/poetry.lock /app/
+RUN touch README.md
+RUN poetry install --with dev --no-root && rm -rf $POETRY_CACHE_DIR
+
+WORKDIR /app
 ENTRYPOINT ["poetry", "run"]
 
 
+
 FROM local-dsmrreader-base AS local-dsmrreader-docs
 WORKDIR /app
 COPY ./documentation/ /app/
+# Do not use Poetry here, as RTD also directly utilizes PIP instead anyway.
 RUN pip install -r /app/requirements.txt
 ENTRYPOINT ["mkdocs"]

provisioning/container/compose.dev.yml

@@ -7,7 +7,7 @@ services:
   dev-dsmr-app:
     container_name: dev-dsmr-app
     restart: 'unless-stopped'
-    command: '/app/manage.py runserver 0.0.0.0:8000'
+    command: 'poetry run /app/manage.py runserver 0.0.0.0:8000'
     build:
       context: .
       dockerfile: provisioning/container/Containerfile-dev
@@ -16,7 +16,8 @@ services:
       - ./src:/app
       - /app/.venv  # Prevents mirroring it to host
     ports:
-      - '8000:8000'
+      # Use these env vars for your IDE's Python interpreter. Set Python path to /app/.venv/bin/python3 as well.
+      - '${HOST_DJANGO_PORT:-8000}:${CONTAINER_DJANGO_PORT:-8000}'
     depends_on:
       dev-dsmr-db:
         condition: service_healthy

provisioning/container/compose.test.yml

@@ -12,7 +12,7 @@ services:
       dockerfile: provisioning/container/Containerfile-dev
       target: local-dsmrreader-dev
     volumes:
-      - ./src:/app
+      - ./src:/app/src
       - /app/.venv  # Prevents mirroring it to host
     depends_on:
       tests-dsmr-db: