From 550d1aad084913f8dd2886c2312ac4dbc92967d3 Mon Sep 17 00:00:00 2001
From: Vladimir Hodakov <vladimir@hodakov.me>
Date: Wed, 8 Jan 2025 06:42:39 +0400
Subject: [PATCH] Update package name

---
 .woodpecker/docker.yaml |  2 +-
 Dockerfile              | 10 ++++++++--
 README.md               |  4 ++--
 config/Caddyfile        | 29 ++++++++++++++++++-----------
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 0d4c1fd..a8e37df 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -4,7 +4,7 @@ when:
   event: [push, pull_request, tag]
 
 variables:
-  - &repo source.hodakov.me/${CI_REPO_OWNER}/docker-phpbb
+  - &repo source.hodakov.me/${CI_REPO_OWNER}/phpbb
 
 steps:
   dryrun:
diff --git a/Dockerfile b/Dockerfile
index 76c3b2b..12fead1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,7 +71,7 @@ COPY phpbb/config.php /phpbb/www
 
 # Expose the ports Caddy is reachable on
 EXPOSE 8080
-EXPOSE 8181
+EXPOSE 9080
 
 WORKDIR /phpbb/www
 
@@ -88,8 +88,14 @@ ENV PHPBB_INSTALL= \
     PHPBB_DEBUG= \
     PHPBB_DEBUG_CONTAINER=
 
+# Add sane default volumes for phpBB
+VOLUME /phpbb/sqlite
+VOLUME /phpbb/www/files
+VOLUME /phpbb/www/store
+VOLUME /phpbb/www/images/avatars/upload
+
 COPY start.sh /usr/local/bin/
 CMD ["start.sh"]
 
 # Configure a healthcheck to validate that everything is up and running
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8080/fpm-ping
+HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:9080/fpm-ping
diff --git a/README.md b/README.md
index b5a1af7..d71277f 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ installer script, just run a temporary container with `PHPBB_INSTALL=true`
 environment variable:
 
 ```console
-$ docker run -p 8181:8181 --name phpbb-install -e PHPBB_INSTALL=true -d source.hodakov.me/hdkv/phpbb
+$ docker run -p 8080:8080 --name phpbb-install -e PHPBB_INSTALL=true -d source.hodakov.me/hdkv/phpbb
 ```
 
-Point your browser to the http://localhost:8181 to begin the
+Point your browser to the http://localhost:8080 to begin the
 installation process.
 
 This image is bundled with SQLite3, MySQL and PostgresSQL database engines
diff --git a/config/Caddyfile b/config/Caddyfile
index f22d5e1..413d16e 100644
--- a/config/Caddyfile
+++ b/config/Caddyfile
@@ -1,16 +1,11 @@
-:8080 {
-    root * /var/www/html/public
-
-    php_fastcgi unix//run/php-fpm.sock {
-        trusted_proxies private_ranges
-    }
-
-    file_server
-
-    log stdout
+{
+	servers {
+		trusted_proxies static private_ranges
+		trusted_proxies_strict
+	}
 }
 
-:8181 {
+:8080 {
     root * /phpbb/www
 
     php_fastcgi unix//run/php-fpm.sock {
@@ -21,3 +16,15 @@
 
     log stdout
 }
+
+:9080 {
+    root * /var/www/html/public
+
+    php_fastcgi unix//run/php-fpm.sock {
+        trusted_proxies private_ranges
+    }
+
+    file_server
+
+    log stdout
+}