Pass REMOTE_ADDR from upstream proxy

.dockerignore

@@ -1,3 +1,4 @@
 .secrets
 .act
 examples
+.env

.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:

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

README.md

@@ -9,6 +9,9 @@ This is a heavily modified fork of [selim13's docker-phpbb image](https://github
 
 You can find an example of forum running using this image at [ks.fhs.sh](https://ks.fhs.sh).
 
+Note: this image expects that you run it behind another reverse proxy and does _not_ handle HTTPS automatically. Use it
+behind another instance of caddy, for example.
+
 # Supported tags and respective `Dockerfile` links
 
 - [`3`,`3.3`, `3.3.14`, `latest`](https://source.hodakov.me/hdkv/docker-phpbb/src/branch/main/Dockerfile) bundled with PHP 8
@@ -22,10 +25,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

config/Caddyfile

@@ -1,4 +1,24 @@
+{
+	servers {
+		trusted_proxies static private_ranges
+		trusted_proxies_strict
+	}
+}
+
 :8080 {
+    root * /phpbb/www
+
+    php_fastcgi unix//run/php-fpm.sock {
+        trusted_proxies private_ranges
+        env REMOTE_ADDR {client_ip}
+    }
+
+    file_server
+
+    log stdout
+}
+
+:9080 {
     root * /var/www/html/public
 
     php_fastcgi unix//run/php-fpm.sock {
@@ -9,15 +29,3 @@
 
     log stdout
 }
-
-:8181 {
-    root * /phpbb/www
-
-    php_fastcgi unix//run/php-fpm.sock {
-        trusted_proxies private_ranges
-    }
-
-    file_server
-
-    log stdout
-}