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 buildx 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 buildx 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

@@ -13,10 +13,10 @@ steps:
         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:
@@ -32,14 +32,14 @@ steps:
       - 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/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:$${DOCKER_EXACT_TAG} 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:$${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/hdkv/phpbb:$${DOCKER_MINOR_TAG} 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:$${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/hdkv/phpbb:$${DOCKER_MAJOR_TAG} 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:$${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/hdkv/phpbb:$${DOCKER_EXACT_TAG}
+      - docker manifest push source.hodakov.me/containers/phpbb:$${DOCKER_EXACT_TAG}
-      - docker manifest push source.hodakov.me/hdkv/phpbb:$${DOCKER_MINOR_TAG}
+      - docker manifest push source.hodakov.me/containers/phpbb:$${DOCKER_MINOR_TAG}
-      - docker manifest push source.hodakov.me/hdkv/phpbb:$${DOCKER_MAJOR_TAG}
+      - docker manifest push source.hodakov.me/containers/phpbb:$${DOCKER_MAJOR_TAG}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     when:

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
 

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 {