small tweaks

.ddev/config.yaml

@@ -1,10 +1,11 @@
+name: pixelfed
 type: laravel
 docroot: public
-php_version: "8.1"
+php_version: "8.3"
 webserver_type: nginx-fpm
 database:
   type: mariadb
-  version: "10.4"
+  version: "10.11"
 disable_settings_management: true
 web_environment:
   - DB_CONNECTION=mysql
@@ -28,5 +29,5 @@ web_environment:
   - APP_DOMAIN=pixelfed.ddev.site
   - ADMIN_DOMAIN=pixelfed.ddev.site
   - SESSION_DOMAIN=pixelfed.ddev.site
-  - "TRUST_PROXIES=*"
+  - TRUST_PROXIES=*
   - LOG_CHANNEL=stack

.env.docker

@@ -972,34 +972,34 @@ DOCKER_APP_RELEASE="latest"
 #
 # Example:
 #
-#   * 8.1
 #   * 8.2
 #   * 8.2.14
+#   * 8.3
 #   * latest
 #
 # Do *NOT* use the full Docker tag (e.g. "8.3.2RC1-fpm-bullseye")
 # *only* the version part. The rest of the full tag is derived from
 # the [DOCKER_APP_RUNTIME] and [PHP_DEBIAN_RELEASE] settings
 # @dottie/validate required
-DOCKER_APP_PHP_VERSION="8.2"
+DOCKER_APP_PHP_VERSION="8.3"
 
 # The container runtime to use.
 #
 # @see https://pixelfed-glitch.github.io/docs/running-pixelfed/docker/runtimes.html
 # @dottie/validate required,oneof=apache nginx fpm
-DOCKER_APP_RUNTIME="apache"
+DOCKER_APP_RUNTIME="nginx"
 
 # The Debian release variant to use of the [php] Docker image
 #
 # Examlpe: [bookworm] or [bullseye]
 # @dottie/validate required,oneof=bookworm bullseye
-DOCKER_APP_DEBIAN_RELEASE="bullseye"
+DOCKER_APP_DEBIAN_RELEASE="bookworm"
 
 # The [php] Docker image base type
 #
 # @see https://pixelfed-glitch.github.io/docs/running-pixelfed/docker/runtimes.html
 # @dottie/validate required,oneof=apache fpm cli
-DOCKER_APP_BASE_TYPE="apache"
+DOCKER_APP_BASE_TYPE="fpm"
 
 # Image to pull the Pixelfed Docker images from.
 #

Dockerfile

@@ -31,7 +31,7 @@ ARG DOTTIE_VERSION="v0.9.5"
 ARG PHP_VERSION="8.3"
 
 # See: https://github.com/docker-library/docs/blob/master/php/README.md#image-variants
-ARG PHP_BASE_TYPE="apache"
+ARG PHP_BASE_TYPE="fpm"
 ARG PHP_DEBIAN_RELEASE="bookworm"
 
 ARG RUNTIME_UID=33 # often called 'www-data'

shell.nix

@@ -1,9 +1,10 @@
 { pkgs ? import <nixpkgs> {} }:
 pkgs.mkShell {
   name = "pixelfed-nix-shell";
-  buildInputs = with pkgs; [ act docker php83Packages.composer nodejs nodePackages.npm ];
+  buildInputs = with pkgs; [ act docker php83 php83Packages.composer nodejs nodePackages.npm mkcert ddev ];
   runScript = "$SHELL";
   shellHook = ''
+      mkcert -install
       export PATH="$PWD/node_modules/.bin/:$PATH"
       export PATH="$PWD/vendor/bin/:$PATH"
   '';