From e4cb43e1e051b5d9d162aa2d8b1873971da055c4 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Thu, 1 May 2025 16:12:56 +0200
Subject: [PATCH 1/3] Remove outdated CSP hosts

---
 moderator/settings.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/moderator/settings.py b/moderator/settings.py
index 8a2b868..ad4e6fe 100644
--- a/moderator/settings.py
+++ b/moderator/settings.py
@@ -195,14 +195,12 @@ def COMPRESS_JINJA2_GET_ENVIRONMENT():
     "'self'",
     "https://*.mozilla.org",
     "https://*.mozilla.net",
-    "https://mozillians.org",
 )
 CSP_IMG_SRC = (
     "'self'",
     "https://*.google-analytics.com",
     "https://*.gravatar.com",
     "https://*.wp.com",
-    "https://cdn.mozillians.org",
     "https://people.mozilla.org",
     "https://*.mozaws.net",
 )

From 39d4424ca52df60d0ef2d1e38eee19cb7d5c3e84 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Fri, 2 May 2025 11:01:24 +0200
Subject: [PATCH 2/3] Remove contribute.json

---
 contribute.json | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 contribute.json

diff --git a/contribute.json b/contribute.json
deleted file mode 100644
index 8a3d471..0000000
--- a/contribute.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "Mozilla Moderator",
-    "description": "Mozilla Moderator is a panel moderation webapp that enables users to view, vote and ask questions on different events.",
-    "repository": {
-        "url": "https://github.com/mozilla/mozmoderator/",
-        "license": "BSD 3-Clause"
-    },
-    "participate": {
-        "home": "https://wiki.mozilla.org/Moderator",
-        "irc": "irc://irc.mozilla.org/#participationsystems",
-        "irc-contacts": [
-            "nemo-yiannis",
-            "tasos",
-            "pierros",
-            "hmitsch",
-            "nikos"
-        ]
-    },
-    "bugs": {
-        "list": "https://github.com/mozilla/mozmoderator/issues",
-        "report": "https://github.com/mozilla/mozmoderator/issues/new"
-    },
-    "urls": {
-        "prod": "https://moderator.mozilla.org",
-        "stage": "https://moderator.staging.paas.mozilla.community"
-    },
-    "keywords": [
-        "python",
-        "django",
-        "html",
-        "javascript",
-        "css"
-    ]
-}

From 61e05de726cb04ecd851eff928d86dfdda4611f8 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Fri, 2 May 2025 21:03:40 +0200
Subject: [PATCH 3/3] Format case of Dockerfile stages

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 18b88ff..77605a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.7 as base
+FROM python:3.11.7 AS base
 
 ENV POETRY_VERSION=1.8.2 \
   POETRY_VIRTUALENVS_IN_PROJECT=true \
@@ -14,7 +14,7 @@ COPY pyproject.toml poetry.lock ./
 
 RUN $POETRY_HOME/bin/poetry install --no-root
 
-FROM base as dev
+FROM base AS dev
 
 WORKDIR /app
 
@@ -50,7 +50,7 @@ EXPOSE $PORT
 CMD ["./bin/run-dev.sh"]
 
 # Production image
-FROM python:3.11.7-slim as prod
+FROM python:3.11.7-slim AS prod
 
 ARG UID=10001
 ARG GID=10001