Merge remote-tracking branch 'upstream/main'

.woodpecker/.build.yml

@@ -0,0 +1,13 @@
+when:
+  event: tag
+  branch: ${CI_REPO_DEFAULT_BRANCH}  
+
+steps:
+  build:
+    image: docker:cli
+    secrets: [comfy_image]
+    commands:
+      - docker build ./artel -t  $${COMFY_IMAGE}  -f ./artel/Dockerfile
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock  
+

.woodpecker/.push.yml

@@ -0,0 +1,19 @@
+when:
+  event: tag
+  branch: ${CI_REPO_DEFAULT_BRANCH}  
+
+steps:
+  push:
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [docker_username, docker_password]
+    settings:
+      registry: forge.citizen4.eu
+      repo: forge.citizen4.eu/${CI_REPO_OWNER}/${CI_REPO_NAME}
+      dockerfile: artel/Dockerfile
+      context: artel
+      tags:
+      - ${CI_COMMIT_TAG}
+      - latest
+
+depends_on:
+  - test

.woodpecker/.test.yml

@@ -0,0 +1,17 @@
+when:
+  event: tag
+  branch: ${CI_REPO_DEFAULT_BRANCH}  
+
+steps:
+  test:
+    image: docker:cli
+    commands:
+      - docker compose -f ./artel/docker-compose-test.yml  run test_comfy
+      - docker compose -f ./artel/docker-compose-test.yml  down      
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    secrets: [uid, gid, database_url, postgres_root_password, postgres_user, postgres_password, postgres_db, django_settings_module, comfy_image]
+
+depends_on:
+  - build
+

artel/Dockerfile

@@ -1,5 +1,5 @@
-# Use an official Python runtime based on Debian 10 "buster" as a parent image.
-FROM python:3.11.3-buster
+# Use an official Python runtime based on Debian 11 "bullseye slim" as a parent image.
+FROM python:3.11.4-slim-bullseye
 
 # Add user that will be used in the container.
 RUN useradd wagtail
@@ -18,7 +18,6 @@ ENV PYTHONUNBUFFERED=1 \
 RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \
     build-essential \
     libpq-dev \
-    libmariadbclient-dev \
     libjpeg62-turbo-dev \
     zlib1g-dev \
     libwebp-dev \

artel/Dockerfile.local

@@ -1,5 +1,5 @@
-# Use an official Python runtime based on Debian 10 "buster" as a parent image.
-FROM python:3.11.3-buster
+# Use an official Python runtime based on Debian 11 "bullseye slim" as a parent image.
+FROM python:3.11.4-slim-bullseye
 
 # Port used by this container to serve HTTP.
 EXPOSE 8000
@@ -15,7 +15,6 @@ ENV PYTHONUNBUFFERED 1
 RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \
     build-essential \
     libpq-dev \
-    libmariadbclient-dev \
     libjpeg62-turbo-dev \
     zlib1g-dev \
     libwebp-dev \

artel/artel/urls.py

@@ -12,6 +12,7 @@ from wagtail.documents import urls as wagtaildocs_urls
 
 from search import views as search_views
 
+handler400 = 'artel.views.my_custom_bad_request_view'
 handler404 = 'artel.views.my_custom_page_not_found_view'
 
 

artel/artel/views.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.http import HttpResponseNotFound
+from django.http import HttpResponseBadRequest
 from sentry_sdk import capture_message
 
 
@@ -7,5 +8,8 @@ def my_custom_page_not_found_view(*args, **kwargs):
     if settings.SENTRY_ENVIRONMENT != 'production':
         capture_message("Page not found!", level="error")
 
-    # return any response here, e.g.:
     return HttpResponseNotFound("Not found")
+
+def my_custom_bad_request_view(*args, **kwargs):
+    capture_message("Bad request!", level="error")
+    return HttpResponseBadRequest("Bad request")

artel/docker-compose-test.yml

@@ -8,23 +8,24 @@ services:
       - POSTGRES_USER
       - POSTGRES_PASSWORD
       - POSTGRES_DB
-    volumes:
-      - ../postgres/:/var/lib/postgresql
-    env_file:
-      - .env
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
   test_comfy:
+    image: ${COMFY_IMAGE}
     depends_on:
-      - test_db
-    build:
-      dockerfile: Dockerfile.local
-      context: ./
+      test_db:
+        condition: service_healthy
     user: "${UID}:${GID}"
-    volumes:
-      - ./:/app
     environment:
+      - UID
+      - GID
       - SECRET_KEY
       - DATABASE_URL
-    env_file:
-      - .env
+      - DJANGO_SETTINGS_MODULE
     command:
       python manage.py test --noinput
+