Better docker container

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Use virtualenv
         run: source venv/bin/activate
       - name: Install dependencies
-        run: pip install -r requirements.txt -r requirements-dev.txt
+        run: pip install .
       - name: Use the dev configuration
         run: cp kmicms/kmicms/configuration.dev.py kmicms/kmicms/configuration.py
       - name: Check Formatting

docker-compose.yml

@@ -8,10 +8,12 @@ services:
     volumes:
       - staticfiles:/app/static
       - mediafiles:/app/media
+    ports:
+      - 8001:80
     depends_on:
       - web
     networks:
-      - traefik
+      # - traefik
       - default
     labels:
       - "traefik.enable=true"
@@ -29,8 +31,8 @@ services:
     image: kmicms_web
     command: /start
     volumes:
-      - staticfiles:/app/static
-      - mediafiles:/app/media
+      - staticfiles:/wagtail-static
+      - mediafiles:/wagtail-media
     env_file:
       - .env
     environment:
@@ -70,6 +72,6 @@ volumes:
   staticfiles:
   mediafiles:
 
-networks:
-  traefik:
-    external: true
+# networks:
+#   traefik:
+#     external: true

etc/docker/web/Dockerfile

@@ -1,9 +1,35 @@
 ARG PYTHON_VERSION=3.12-slim-bookworm
 
-FROM python:${PYTHON_VERSION}
+FROM python:${PYTHON_VERSION} as builder
+
+WORKDIR /app
+
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_VIRTUALENVS_CREATE=1 \
+    POETRY_CACHE_DIR=/tmp/poetry_cache
+
+RUN pip install wheel poetry==1.7.1
+
+RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \
+    build-essential
+
+COPY pyproject.toml poetry.lock ./
+RUN touch README.md
+
+RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --without dev --no-root
+
+FROM python:${PYTHON_VERSION} as runtime
 
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
+ENV VIRTUAL_ENV=/app/.venv
+ENV PATH="/app/.venv/bin:$PATH"
+
+WORKDIR /app
+
+RUN addgroup --system wagtail \
+    && adduser --system --ingroup wagtail wagtail
 
 # Install system packages required by Wagtail and wagtail.
 RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \
@@ -14,13 +40,6 @@ RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-r
     libwebp-dev \
  && rm -rf /var/lib/apt/lists/*
 
-RUN addgroup --system wagtail \
-    && adduser --system --ingroup wagtail wagtail
-
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements.txt /requirements.txt
-RUN pip install -r /requirements.txt
-
 COPY ./etc/docker/web/entrypoint /entrypoint
 RUN chmod +x /entrypoint
 RUN chown wagtail /entrypoint
@@ -29,16 +48,17 @@ COPY ./etc/docker/web/start /start
 RUN chmod +x /start
 RUN chown wagtail /start
 
-WORKDIR /app
-
 # avoid 'permission denied' error
 RUN mkdir /app/static
 RUN mkdir /app/media
 
-COPY . .
-COPY ./kmicms/kmicms/configuration.prod.py /app/kmicms/kmicms/configuration.py
+COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
+
+COPY ./kmicms/kmicms/configuration.prod.py ./kmicms/configuration.py
+
+COPY kmicms .
 
-RUN chown -R wagtail:wagtail /app
+RUN chown -R wagtail:wagtail .
 
 USER wagtail
 

etc/docker/web/start

@@ -4,7 +4,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-python /app/kmicms/manage.py collectstatic --noinput
-python /app/kmicms/manage.py migrate
+python /app/manage.py collectstatic --noinput
+python /app/manage.py migrate
 
-/usr/local/bin/gunicorn kmicms.wsgi:application --bind 0.0.0.0:8000 --chdir=/app/kmicms
+/app/.venv/bin/gunicorn kmicms.wsgi:application --bind 0.0.0.0:8000 --chdir=/app

kmicms/kmicms/settings.py

@@ -269,10 +269,10 @@
     },
 }
 
-STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_ROOT = os.path.join(BASE_DIR, "wagtail-static")
 STATIC_URL = "/static/"
 
-MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+MEDIA_ROOT = os.path.join(BASE_DIR, "wagtail-media")
 MEDIA_URL = "/media/"
 
 

kmicms/kmicms/urls.py

@@ -1,3 +1,4 @@
+from core import views as search_views
 from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
@@ -6,8 +7,6 @@
 from wagtail.contrib.sitemaps.views import sitemap
 from wagtail.documents import urls as wagtaildocs_urls
 
-from core import views as search_views
-
 urlpatterns = [
     path("admin/", include(wagtailadmin_urls)),
     path("accounts/", include("accounts.urls")),

kmicms/pages/contact/models.py

@@ -1,15 +1,14 @@
 from typing import Any
 
 from django.db import models
+from integrations.discord import submit_discord_webhook_for_form
 from modelcluster.fields import ParentalKey
 from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
 from wagtail.contrib.forms.models import AbstractFormField, FormMixin
 from wagtail.contrib.forms.panels import FormSubmissionsPanel
 from wagtail.fields import RichTextField
 from wagtail.models import Page
 
-from integrations.discord import submit_discord_webhook_for_form
-
 from .forms import ContactFormBuilder, remove_captcha_field
 
 

kmicms/pages/home/models.py

@@ -1,10 +1,9 @@
+from core.blocks import BodyBlock
 from wagtail.admin.panels import FieldPanel, TitleFieldPanel
 from wagtail.fields import StreamField
 from wagtail.models import Page
 from wagtail.search import index
 
-from core.blocks import BodyBlock
-
 
 class HomePage(Page):
     parent_page_types = ["wagtailcore.Page"]

kmicms/pages/infra/models.py

@@ -1,12 +1,11 @@
 from django.conf import settings
 from django.http import Http404, HttpRequest, HttpResponse
+from integrations.netbox import NetboxClient, NetboxRequestError
 from wagtail.admin.panels import FieldPanel, TitleFieldPanel
 from wagtail.contrib.routable_page.models import RoutablePageMixin, path
 from wagtail.fields import RichTextField
 from wagtail.models import Page
 
-from integrations.netbox import NetboxClient, NetboxRequestError
-
 
 class NetboxInfrastructurePage(RoutablePageMixin, Page):
     max_count = 1

kmicms/pages/standard_page/models.py

@@ -1,11 +1,10 @@
+from core.blocks import StoryBlock
 from django.db import models
 from wagtail.admin.panels import FieldPanel, TitleFieldPanel
 from wagtail.fields import StreamField
 from wagtail.models import Page
 from wagtail.search import index
 
-from core.blocks import StoryBlock
-
 
 class StandardPage(Page):
     content = StreamField(StoryBlock(), use_json_field=True)

pyproject.toml

@@ -30,6 +30,7 @@ requests = "^2.31.0"
 gunicorn = "^21.2.0"
 psycopg = {extras = ["binary", "pool"], version = "^3.1.16"}
 redis = "^5.0.1"
+setuptools = "^69.0.3"
 
 [tool.poetry.group.dev.dependencies]
 django-debug-toolbar = "^4.2.0"