Add bereich field task

.docker/Dockerfile.debug.api

@@ -0,0 +1,53 @@
+FROM python:3.10-slim-bookworm
+
+RUN mkdir /badgr_server
+WORKDIR /badgr_server
+
+RUN apt-get clean all && apt-get update && apt-get upgrade -y
+RUN apt-get install -y default-libmysqlclient-dev \
+                       python3-dev \
+                       python3-cairo \
+                       build-essential \
+                       xmlsec1 \
+                       libxmlsec1-dev \
+                       pkg-config \
+                       default-mysql-client \
+                       curl \
+                       xz-utils
+
+RUN pip install uwsgi
+
+COPY requirements.txt              /badgr_server
+
+COPY crontab                       /etc/cron.d/crontab
+
+RUN touch /var/log/cron_cleartokens.log && chmod 644 /var/log/cron_cleartokens.log
+RUN touch /var/log/cron_qr_badgerequests.log && chmod 644 /var/log/cron_qr_badgerequests.log
+RUN touch /var/log/cron_clear_altcha.log && chmod 644 /var/log/cron_clear_altcha.log
+RUN touch /var/log/cron_clear_iframe_urls.log && chmod 644 /var/log/cron_clear_iframe_urls.log
+
+ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.30/supercronic-linux-amd64 \
+    SUPERCRONIC=supercronic-linux-amd64 \
+    SUPERCRONIC_SHA1SUM=9f27ad28c5c57cd133325b2a66bba69ba2235799
+ENV TZ="Europe/Berlin"
+
+RUN curl -fsSLO "$SUPERCRONIC_URL" \
+    && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
+    && chmod +x "$SUPERCRONIC" \
+    && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
+    && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
+
+# Get node and install mjml for email templates
+ARG NODE_VERSION=v24.6.0
+ARG MJML_VERSION=4.17.1
+RUN curl -fsSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz -o node.tar.xz \
+    && tar -xf node.tar.xz -C /usr/local --strip-components=1 \
+    && rm node.tar.xz
+ENV PATH="/usr/local/bin:${PATH}"
+RUN npm install -g mjml@${MJML_VERSION}
+
+# Add timestamp
+RUN date +"%d.%m.%y %T" > timestamp
+
+RUN pip --timeout=1000 install --no-dependencies -r requirements.txt
+RUN pip --timeout=1000 install debugpy

.docker/Dockerfile.dev.api

@@ -1,18 +1,62 @@
-FROM python:3.8-slim
+FROM python:3.10-slim-bookworm
 
 RUN mkdir /badgr_server
 WORKDIR /badgr_server
 
-RUN apt-get update && apt-get upgrade -y
+RUN apt-get clean all && apt-get update && apt-get upgrade -y
 RUN apt-get install -y default-libmysqlclient-dev \
-                       python3-dev \
-                       python3-cairo \
-                       build-essential \
-                       xmlsec1 \
-                       libxmlsec1-dev \
-                       pkg-config
+    python3-dev \
+    python3-cairo \
+    build-essential \
+    xmlsec1 \
+    libxmlsec1-dev \
+    pkg-config \
+    default-mysql-client \
+    curl \
+    xz-utils
 
 RUN pip install uwsgi
 
 COPY requirements.txt              /badgr_server
-RUN pip install -r requirements.txt
+
+COPY entrypoint.dev.sh             /badgr_server
+
+COPY crontab                       /etc/cron.d/crontab
+
+COPY openbadges                    /badgr_server
+
+COPY openbadges_bakery             /badgr_server
+
+RUN chmod +x entrypoint.dev.sh
+
+RUN touch /var/log/cron_cleartokens.log && chmod 644 /var/log/cron_cleartokens.log
+RUN touch /var/log/cron_qr_badgerequests.log && chmod 644 /var/log/cron_qr_badgerequests.log
+RUN touch /var/log/cron_clear_altcha.log && chmod 644 /var/log/cron_clear_altcha.log
+RUN touch /var/log/cron_clear_iframe_urls.log && chmod 644 /var/log/cron_clear_iframe_urls.log
+
+ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.30/supercronic-linux-amd64 \
+    SUPERCRONIC=supercronic-linux-amd64 \
+    SUPERCRONIC_SHA1SUM=9f27ad28c5c57cd133325b2a66bba69ba2235799
+ENV TZ="Europe/Berlin"
+
+RUN curl -fsSLO "$SUPERCRONIC_URL" \
+    && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
+    && chmod +x "$SUPERCRONIC" \
+    && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
+    && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
+
+# Get node and install mjml for email templates
+ARG NODE_VERSION=v24.6.0
+ARG MJML_VERSION=4.17.1
+RUN curl -fsSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz -o node.tar.xz \
+    && tar -xf node.tar.xz -C /usr/local --strip-components=1 \
+    && rm node.tar.xz
+ENV PATH="/usr/local/bin:${PATH}"
+RUN npm install -g mjml@${MJML_VERSION}
+
+# Add timestamp
+RUN date +"%d.%m.%y %T" > timestamp
+
+RUN pip --timeout=1000 install --no-dependencies -r requirements.txt
+
+ENTRYPOINT ["/badgr_server/entrypoint.dev.sh"]

.docker/Dockerfile.prod.api

@@ -1,23 +1,90 @@
-FROM python:3.8-slim
+# Best practies taken from here: https://snyk.io/blog/best-practices-containerizing-python-docker/
+
+# ------------------------------> Build image
+FROM python:3.10-slim-bookworm AS build
+RUN apt-get update
+RUN apt-get install -y default-libmysqlclient-dev \
+    python3-dev \
+    python3-cairo \
+    build-essential \
+    xmlsec1 \
+    libxmlsec1-dev \
+    pkg-config \
+    cron
 
 RUN mkdir /badgr_server
 WORKDIR /badgr_server
+RUN python -m venv /badgr_server/venv
+ENV PATH="/badgr_server/venv/bin:$PATH"
+
+COPY requirements.txt .
+RUN pip install --no-dependencies -r requirements.txt
 
-RUN apt-get update && apt-get upgrade -y
+# ------------------------------> Final image
+FROM python:3.10-slim-bookworm
+RUN apt-get clean all && apt-get update
 RUN apt-get install -y default-libmysqlclient-dev \
-                       python3-dev \
-                       python3-cairo \
-                       build-essential \
-                       xmlsec1 \
-                       libxmlsec1-dev \
-                       pkg-config
-
-COPY requirements.txt                   /badgr_server
-COPY manage.py                          /badgr_server
-COPY .docker/etc/uwsgi.ini              /badgr_server
-COPY .docker/etc/wsgi.py                /badgr_server
-COPY apps                               /badgr_server/apps
-COPY .docker/etc/settings_local.py      /badgr_server/apps/mainsite/
-
-RUN pip install uwsgi
-RUN pip install -r requirements.txt
+    python3-cairo \
+    libxml2 \
+    default-mysql-client \
+    cron \
+    curl \
+    xz-utils
+
+RUN groupadd -g 999 python && \
+    useradd -r -u 999 -g python python
+
+RUN mkdir /badgr_server && chown python:python /badgr_server
+RUN mkdir /backups && chown python:python /backups
+
+WORKDIR /badgr_server
+
+# Copy installed dependencies
+COPY --chown=python:python --from=build /badgr_server/venv /badgr_server/venv
+
+# Copy everything related Django stuff
+COPY --chown=python:python  manage.py                          .
+COPY --chown=python:python  .docker/etc/uwsgi.ini              .
+COPY --chown=python:python  .docker/etc/wsgi.py                .
+COPY --chown=python:python  apps                               ./apps
+COPY --chown=python:python  openbadges                         ./openbadges
+COPY --chown=python:python  openbadges_bakery                  ./openbadges_bakery
+COPY --chown=python:python  .docker/etc/settings_local.py      ./apps/mainsite/
+COPY --chown=python:python  entrypoint.sh                      .
+
+RUN chmod +x entrypoint.sh
+
+# Latest releases available at https://github.com/aptible/supercronic/releases
+ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.2.30/supercronic-linux-amd64 \
+    SUPERCRONIC=supercronic-linux-amd64 \
+    SUPERCRONIC_SHA1SUM=9f27ad28c5c57cd133325b2a66bba69ba2235799
+ENV TZ="Europe/Berlin"
+
+RUN curl -fsSLO "$SUPERCRONIC_URL" \
+    && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
+    && chmod +x "$SUPERCRONIC" \
+    && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
+    && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
+
+# Get node and install mjml for email templates
+ARG NODE_VERSION=v24.6.0
+ARG MJML_VERSION=4.17.1
+RUN curl -fsSL https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz -o node.tar.xz \
+    && tar -xf node.tar.xz -C /usr/local --strip-components=1 \
+    && rm node.tar.xz
+ENV PATH="/usr/local/bin:${PATH}"
+RUN npm install -g mjml@${MJML_VERSION}
+
+# Add timestamp
+RUN date +"%d.%m.%y %T" > timestamp && chown python:python timestamp
+
+USER 999
+
+# Create necessary log files as user
+RUN touch /var/log/cron_cleartokens.log && chmod 644 /var/log/cron_cleartokens.log
+RUN touch /var/log/cron_qr_badgerequests.log && chmod 644 /var/log/cron_qr_badgerequests.log
+RUN touch /var/log/cron_clear_altcha.log && chmod 644 /var/log/cron_clear_altcha.log
+RUN touch /var/log/cron_clear_iframe_urls.log && chmod 644 /var/log/cron_clear_iframe_urls.log
+
+ENV PATH="/badgr_server/venv/bin:$PATH"
+ENTRYPOINT ["./entrypoint.sh"]

.docker/etc/nginx.conf → .docker/config/nginx/nginx.conf

@@ -17,11 +17,19 @@ http {
     sendfile        on;
 
     keepalive_timeout  65;
+    client_max_body_size 10M;
 
     gzip on;
     gzip_types text/plain application/xml;
     gzip_proxied expired no-cache no-store private auth;
     gzip_vary on;
 
+    map $http_origin $allowed_origin {
+      default "";
+      "https://develop.openbadges.education" "https://develop.openbadges.education";
+      "https://staging.openbadges.education" "https://staging.openbadges.education";
+      "https://openbadges.education" "https://openbadges.education";
+    }
+
     include /etc/nginx/sites-available/*;
 }

.docker/config/nginx/sites-available/site.conf

@@ -0,0 +1,31 @@
+upstream uwsgi {
+    server unix:/sock/app.sock;
+}
+
+server {
+    listen    80;
+    charset   utf-8;
+
+    location /media  {
+         alias /mediafiles;
+         add_header Access-Control-Allow-Origin $allowed_origin always;
+         add_header Vary Origin;
+    }
+
+    location /static {
+        alias /staticfiles;
+        add_header Access-Control-Allow-Origin *;
+    }
+
+    location / {
+        uwsgi_pass  uwsgi;
+
+        uwsgi_param HTTP_HOST $http_host;
+        uwsgi_param HTTP_REFERER $http_referer;
+        uwsgi_param HTTP_X_FORWARDED_FOR $proxy_add_x_forwarded_for;
+        uwsgi_param HTTP_X_FORWARDED_PROTO $scheme;
+
+        include     /etc/nginx/uwsgi_params;
+    }
+
+}

.docker/etc/init.sql

@@ -1 +1 @@
-CREATE DATABASE IF NOT EXISTS badgr;
+CREATE DATABASE IF NOT EXISTS badgr CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;