UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-25 15:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

sort ARG in Dockerfile

Browse source
This commit is contained in:
Christian Winther 2024-01-26 23:39:18 +00:00
parent 36850235a8
commit b73d452255
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.env.docker
View file

@ -949,14 +949,21 @@ DOCKER_APP_RELEASE="branch-jippi-fork"
# the [DOCKER_APP_RUNTIME] and [PHP_DEBIAN_RELEASE] settings # the [DOCKER_APP_RUNTIME] and [PHP_DEBIAN_RELEASE] settings
DOCKER_APP_PHP_VERSION="8.2" 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 # See: https://docs.pixelfed.org/running-pixelfed/docker/runtimes.html
DOCKER_APP_BASE_TYPE="apache" DOCKER_APP_RUNTIME="apache"
# The Debian release variant to use of the [php] Docker image # The Debian release variant to use of the [php] Docker image
#
# Examlpe: [bookworm] or [bullseye]
DOCKER_APP_DEBIAN_RELEASE="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. # Image to pull the Pixelfed Docker images from.
# #
# Example values: # Example values:
@ -967,11 +974,6 @@ DOCKER_APP_DEBIAN_RELEASE="bullseye"
# #
DOCKER_APP_IMAGE="ghcr.io/jippi/pixelfed" 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. # Pixelfed version (image tag) to pull from the registry.
# #
# See: https://github.com/pixelfed/pixelfed/pkgs/container/pixelfed # See: https://github.com/pixelfed/pixelfed/pkgs/container/pixelfed

1
Dockerfile
View file

@ -161,6 +161,7 @@ ARG TARGETPLATFORM
COPY --from=php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ 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 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 \ 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-${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 \ --mount=type=cache,id=pixelfed-apt-cache-${PHP_VERSION}-${PHP_DEBIAN_RELEASE}-${TARGETPLATFORM},sharing=locked,target=/var/cache/apt \