Merge main & update to bikkelhart/internet-nl@87f11734

    git fetch bikkelhart
    git fetch internetnl
    git merge -X theirs internetnl/main
    git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
    git checkout --no-overlay main -- interface/static/question@internet.nl_0x45028563.asc
    convert -resize 48x48 interface/static/favicon.{png,ico}
    git add interface/static/favicon.ico
    git rm package{,-lock}.json
    # manual merge of docker/Dockerfile, docker/compose.development.yaml, fix .gitignore, note: changed *.js copy and base template
    git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"

Author: bwbroersma

.gitignore

@@ -83,4 +83,4 @@ config-compose-*
 
 # Frontend
 frontend/node_modules
-frontend/build
+frontend/dist

bin/frontend.py

@@ -76,7 +76,7 @@ def _populate_HOF(hof, model, entry_creation):
     previousscore = 0
     previoustimestamp = None
     previousreportid = None
-    for report in model.objects.all().order_by("domain", "timestamp"):
+    for report in model.objects.only("id", "domain", "timestamp", "score").order_by("domain", "timestamp").iterator():
         if previousname != report.domain and previousname is not None:
             if previousscore >= 100:
                 entry_creation(hof, previousname, previousreportid, previoustimestamp)

checks/tasks/update.py

@@ -134,16 +134,17 @@ USER unbound
 
 ENTRYPOINT ["/entrypoint.sh"]
 
-FROM debian:bullseye-20241111-slim AS frontend
+# build frontend image target
+FROM --platform=linux/amd64 debian:bullseye-20241111-slim AS frontend
 
 # install npm from official image
-COPY --from=node:20-slim /usr/local/bin/ /usr/local/bin/
-COPY --from=node:20-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
+COPY --from=node:22-slim /usr/local/bin/ /usr/local/bin/
+COPY --from=node:22-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
 
 ADD frontend/ /app/frontend
 WORKDIR /app/frontend
 RUN npm install
-RUN npm run css:build
+RUN npm run docker:build
 
 # build main application image target
 FROM --platform=linux/amd64 debian:bullseye-20241111-slim AS build-app
@@ -216,22 +217,14 @@ RUN install -d -m 0755 -o nobody -g nogroup /app/batch_results
 # some js/css files use a separate script to generate minimized versions
 # storage these in a place for django to find
 RUN mkdir -p /app/static_frontend
-# minimize JS files
-RUN python3 bin/frontend.py js
-# copy build/minimized CSS files from frontand stage
+# copy build/minimized CSS files from frontend stage
 COPY --from=frontend --chown=nobody:nogroup /app/static_frontend/css/*.css /app/static_frontend/css/
+# copy build/minimized JS files from frontend stage
+COPY --from=frontend --chown=nobody:nogroup /app/static_frontend/js/ /app/static_frontend/js/
 
 # generate language files
 RUN python3 bin/pofiles.py to_django
 
-# copy dependencies to rebuild CSS (postcss)
-COPY --from=frontend /usr/local/bin/ /usr/local/bin/
-COPY --from=frontend /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=frontend /app/frontend/node_modules /app/frontend/node_modules
-
-# copy browser reload module
-COPY --from=linttest-deps /usr/local/lib/python${PYTHON_VERSION}/dist-packages/django_browser_reload /usr/local/lib/python${PYTHON_VERSION}/dist-packages/django_browser_reload
-
 # use fake version to prevent building the next steps when only the version changes
 ENV SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0-build0
 
@@ -249,6 +242,19 @@ ENV SETUPTOOLS_SCM_PRETEND_VERSION=$RELEASE
 ENTRYPOINT [ "python3", "./manage.py"]
 CMD ["runserver", "0.0.0.0:8080"]
 
+# app image with development tools for better live reloading
+FROM app AS app-dev
+
+# required for compose `develop` mode file sync/copy
+USER root
+
+# copy dependencies to rebuild CSS (postcss)
+COPY --from=frontend /usr/local/bin/ /usr/local/bin/
+COPY --from=frontend /usr/local/lib/node_modules /usr/local/lib/node_modules
+
+# copy browser reload module
+COPY --from=linttest-deps /usr/local/lib/python${PYTHON_VERSION}/dist-packages/django_browser_reload /usr/local/lib/python${PYTHON_VERSION}/dist-packages/django_browser_reload
+
 # supplement application with unittest, lint dependencies
 FROM build-app AS linttest
 ARG PYTHON_VERSION

docker/Dockerfile

@@ -17,35 +17,21 @@ services:
     environment:
       - INTERNETNL_DOMAINNAME
 
-  webserver:
-    build:
-      context: ..
-      dockerfile: docker/webserver.Dockerfile
-    develop:
-      watch:
-        # auto rebuild/reload when config files change
-        - path: ./webserver/
-          action: rebuild
-
   app:
-    develop:
-      watch:
-        # auto rebuild/reload when CSS/JS changes
-        - path: ../frontend/js
-          action: sync+exec
-          target: /app/frontend/js
-          exec:
-            command: python3 bin/frontend.py js
+    build:
+      target: app-dev
     # use Django runserver for better debug abilities during development
     entrypoint: ["/bin/bash"]
     # run CSS auto rebuild in the background and start devserver
     command:
       - "-c"
       - >
         if [ "$INTERNETNL_AUTORELOAD" = "True" ]; then
-          # watch CSS files for rebuild
+          # install npm dependencies and watch CSS and JS files for rebuild
           cd /app/frontend;
-          npm run css:build:watch &
+          # It's needed to install the rollup linux dependency
+          npm install;
+          npm run docker:watch &
           cd /app;
           # start development server with auto reloading
           ./manage.py runserver 0.0.0.0:8080
@@ -60,8 +46,8 @@ services:
       - ../checks:/app/checks
       - ../interface:/app/interface
       - ../internetnl:/app/internetnl
-      # mount CSS files so `css:build:watch` can detect changes an rebuild
-      - ../frontend/css:/app/frontend/css
+      # mount frontend files so build tools can detect changes and rebuild
+      - ../frontend/src:/app/frontend/src
 
   worker:
     volumes:

docker/compose.development.yaml

@@ -34,6 +34,8 @@ RUN mkdir -p /var/www/internet.nl/.well-known/
 # copy all security*.txt files
 COPY .well-known/security*.txt /var/www/internet.nl/.well-known/
 COPY interface/static/favicon.ico /var/www/internet.nl/
+COPY interface/static/favicon.svg /var/www/internet.nl/
+COPY interface/static/favicon.png /var/www/internet.nl/
 
 COPY docker/webserver/nginx_templates/* /etc/nginx/templates/
 COPY docker/webserver/mime.types /etc/nginx/

docker/webserver.Dockerfile

@@ -178,9 +178,6 @@ server {
 
         proxy_set_header REMOTE-USER $remote_user;
 
-        # forward client IP for rate limiting on tasks (see `redis_id.py` `req_limit`)
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
         include /etc/nginx/conf.d/basic_auth.include;
         # set proxy_pass argument for 'app' container as variable, this way nginx doesn't fail when 'app' is unresolvable at startup
         set $app http://app:8080;
@@ -220,8 +217,6 @@ server {
         # pass host for Django's allowed_hosts
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Proto $scheme;
-        # forward client IP for rate limiting on tasks (see `redis_id.py` `req_limit`)
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         # set proxy_pass argument for 'app' container as variable, this way nginx doesn't fail when 'app' is unresolvable at startup
         set $app http://app:8080;
         proxy_pass $app;
@@ -249,6 +244,12 @@ server {
     location = /favicon.ico {
         alias /var/www/internet.nl/favicon.ico;
     }
+    location = /favicon.svg {
+        alias /var/www/internet.nl/favicon.svg;
+    }
+    location = /favicon.png {
+        alias /var/www/internet.nl/favicon.png;
+    }
 
     # static files served from app
     location /static {

docker/webserver/nginx_templates/app.conf.template

@@ -56,7 +56,7 @@
             Packages("certbot"),
             File("webserver/authentication.sh,webserver/tls_init.sh"),
             File("webserver/nginx_templates"),
-            File("robots.txt,.well-known/security.txt,favicon.ico"),
+            File("robots.txt,.well-known/security.txt,favicon.svg"),
             File("certbot/entrypoint.sh"),
         ] >> Image("ghcr.io/internetstandards/webserver")
 

documentation/images/dockerfiles.py

@@ -1 +1,12 @@
-{ "extends": ["stylelint-config-standard"] }
+{
+    "extends": [
+        "stylelint-config-standard"
+    ],
+    "rules": {
+        "selector-type-no-unknown": null,
+        "selector-pseudo-element-no-unknown": null,
+        "selector-pseudo-class-no-unknown": null,
+        "declaration-property-value-no-unknown": null,
+        "no-descending-specificity": null
+    }
+}