Update to 3.3.16

This reverts commit e62b953a1b.

.woodpecker/build.yaml

@@ -14,7 +14,7 @@ steps:
   test-build:
     image: docker:27-dind
     commands:
-      - docker build -t source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-${platform##linux/} .
+      - docker buildx build -t source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-${platform##linux/} .
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     when:
@@ -27,8 +27,8 @@ steps:
         from_secret: registry_token
     commands:
       - docker login -u ${CI_REPO_OWNER} -p $${CI_USER_PASSWORD} source.hodakov.me
-      - docker build -t source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-${platform##linux/} .
+      - docker buildx build -t source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-${platform##linux/} .
-      - docker push source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-${platform##linux/}
+      - docker push source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-${platform##linux/}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     when:

.woodpecker/tag.yaml

@@ -6,16 +6,41 @@ depends_on:
   - build
 
 steps:
-  tag:
+  tag latest:
     image: docker:27-dind
     environment:
       CI_USER_PASSWORD:
         from_secret: registry_token
     commands:
       - docker login -u ${CI_REPO_OWNER} -p $${CI_USER_PASSWORD} source.hodakov.me
-      - docker pull source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-amd64
+      - docker pull source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-amd64
-      - docker pull source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-arm64
+      - docker pull source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-arm64
-      - docker manifest create source.hodakov.me/hdkv/phpbb:latest source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-amd64 source.hodakov.me/hdkv/phpbb:${CI_COMMIT_SHA:0:10}-arm64
+      - docker manifest create source.hodakov.me/containers/phpbb:latest source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-amd64 source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-arm64
-      - docker manifest push source.hodakov.me/hdkv/phpbb:latest
+      - docker manifest push source.hodakov.me/containers/phpbb:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    when:
+      event: push
+
+  tag semver:
+    image: docker:27-dind
+    environment:
+      CI_USER_PASSWORD:
+        from_secret: registry_token
+    commands:
+      - set -eu
+      - docker login -u ${CI_REPO_OWNER} -p $${CI_USER_PASSWORD} source.hodakov.me
+      - source ./scripts/semver.sh
+      - echo "Creating manifest for $${DOCKER_EXACT_TAG}, $${DOCKER_MAJOR_TAG} and $${DOCKER_MINOR_TAG}"
+      - docker pull source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-amd64
+      - docker pull source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-arm64
+      - docker manifest create source.hodakov.me/containers/phpbb:$${DOCKER_EXACT_TAG} source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-amd64 source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-arm64
+      - docker manifest create source.hodakov.me/containers/phpbb:$${DOCKER_MINOR_TAG} source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-amd64 source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-arm64
+      - docker manifest create source.hodakov.me/containers/phpbb:$${DOCKER_MAJOR_TAG} source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-amd64 source.hodakov.me/containers/phpbb:${CI_COMMIT_SHA:0:10}-arm64
+      - docker manifest push source.hodakov.me/containers/phpbb:$${DOCKER_EXACT_TAG}
+      - docker manifest push source.hodakov.me/containers/phpbb:$${DOCKER_MINOR_TAG}
+      - docker manifest push source.hodakov.me/containers/phpbb:$${DOCKER_MAJOR_TAG}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    when:
+      event: tag

Dockerfile

@@ -1,6 +1,7 @@
 # Install Caddy
 FROM docker.io/caddy:builder-alpine AS caddy-builder
-RUN xcaddy build
+RUN xcaddy build \
+    --with github.com/mholt/caddy-ratelimit
 
 
 # Install PHP
@@ -55,8 +56,8 @@ RUN mkdir /.config /phpbb
 COPY src/ /var/www/html/
 
 # Add phpBB installation
-ENV PHPBB_VERSION=3.3.14
+ENV PHPBB_VERSION=3.3.16
-ENV PHPBB_SHA256=68cd6cf3faefa175ea3892ba02c6b112e8967ed33703521c79820e35bd15ec9a
+ENV PHPBB_SHA256=d1964a2b0cae7d5ba761e5a77467075b463348fb6e8189ed539f09e7d98ce505
 
 WORKDIR /tmp
 

README.md

@@ -175,8 +175,11 @@ If set to `true`, enables phpBB debug mode.
 
 ## Volumes
 
-No default volumes are predefined. You can mount everything you want
+There are predefined volumes in the image:
-inside `/phpbb/<something>`. For example, given that [ks.fhs.sh](https://ks.fhs.sh)
+
-was migrating into Docker from bare metal instance back in 2023, I
+- /phpbb/sqlite
-mounted the directories `files`, `store`, `ext`, `images` and
+- /phpbb/www/files
-`themes`, which proved working for more than a year at this point.
+- /phpbb/www/store
+- /phpbb/www/images/avatars/upload
+
+This list of volumes should be good enough for a forum that starts from scratch.

config/Caddyfile

@@ -6,6 +6,17 @@
 }
 
 :8080 {
+    rate_limit {
+        distributed
+        zone dynamic {
+            key    {client_ip}
+            events 20
+            window 5s
+            jitter 0.1
+        }
+        log_key
+    }
+
     root * /phpbb/www
 
     php_fastcgi unix//run/php-fpm.sock {