Reconcile with 8.1-bullseye

Author: stronk7

.github/workflows/test_buildx_and_publish.yml

@@ -35,7 +35,7 @@ jobs:
 
   Publish:
     # Completely avoid forks and pull requests to try this job.
-    if: github.repository_owner == 'moodlehq' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+    if: github.repository_owner == 'moodlehq' && contains(fromJson('["push", "workflow_dispatch"]'), github.event_name)
     # Requires Test to pass
     needs: Test
     runs-on: ubuntu-latest

Dockerfile

@@ -1,6 +1,6 @@
 FROM php:8.1-apache-bullseye
 
-# So we can use it anywhere for conditional stuff. Keeping BC with old (non-buildkit, builders).
+# So we can use it anywhere for conditional stuff. Keeping BC with old (non-buildkit, builders)
 ARG TARGETPLATFORM
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM}"