diff --git a/.env.docker b/.env.docker index 1efd91843..8ca07c21f 100644 --- a/.env.docker +++ b/.env.docker @@ -949,14 +949,21 @@ DOCKER_APP_RELEASE="branch-jippi-fork" # the [DOCKER_APP_RUNTIME] and [PHP_DEBIAN_RELEASE] settings DOCKER_APP_PHP_VERSION="8.2" -# The [php] Docker image base type +# The container runtime to use. # -# See: https://github.com/pixelfed/pixelfed/blob/dev/docker/runtimes.md -DOCKER_APP_BASE_TYPE="apache" +# See: https://docs.pixelfed.org/running-pixelfed/docker/runtimes.html +DOCKER_APP_RUNTIME="apache" # The Debian release variant to use of the [php] Docker image +# +# Examlpe: [bookworm] or [bullseye] DOCKER_APP_DEBIAN_RELEASE="bullseye" +# The [php] Docker image base type +# +# See: https://docs.pixelfed.org/running-pixelfed/docker/runtimes.html +DOCKER_APP_BASE_TYPE="apache" + # Image to pull the Pixelfed Docker images from. # # Example values: @@ -967,11 +974,6 @@ DOCKER_APP_DEBIAN_RELEASE="bullseye" # DOCKER_APP_IMAGE="ghcr.io/jippi/pixelfed" -# The container runtime to use. -# -# See: https://github.com/jippi/pixelfed/blob/jippi-fork/docker/runtimes.md -DOCKER_APP_RUNTIME="apache" - # Pixelfed version (image tag) to pull from the registry. # # See: https://github.com/pixelfed/pixelfed/pkgs/container/pixelfed diff --git a/Dockerfile b/Dockerfile index f5aca8235..1c8a30155 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,6 +161,7 @@ ARG TARGETPLATFORM COPY --from=php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ COPY docker/shared/root/docker/install/php-extensions.sh /docker/install/php-extensions.sh + RUN --mount=type=cache,id=pixelfed-pear-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/tmp/pear \ --mount=type=cache,id=pixelfed-apt-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/lib/apt \ --mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \