UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-09 16:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

allow skipping one-time setup tasks

Browse source
This commit is contained in:
Christian Winther 2024-01-15 18:44:43 +00:00
parent 7f99bb1024
commit 685f62a5d0
3 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -40,8 +40,8 @@ ARG RUNTIME_GID=33 # often called 'www-data'
ARG APT_PACKAGES_EXTRA="" ARG APT_PACKAGES_EXTRA=""
# Extensions installed via [pecl install] # Extensions installed via [pecl install]
ARG PHP_PECL_EXTENSIONS="" ARG PHP_PECL_EXTENSIONS=
ARG PHP_PECL_EXTENSIONS_EXTRA="" ARG PHP_PECL_EXTENSIONS_EXTRA=
# Extensions installed via [docker-php-ext-install] # Extensions installed via [docker-php-ext-install]
ARG PHP_EXTENSIONS="intl bcmath zip pcntl exif curl gd" ARG PHP_EXTENSIONS="intl bcmath zip pcntl exif curl gd"

3
docker/shared/root/docker/entrypoint.d/04-defaults.envsh
View file

@ -10,6 +10,9 @@
entrypoint-set-script-name "${BASH_SOURCE[0]}" entrypoint-set-script-name "${BASH_SOURCE[0]}"
: "${MAX_PHOTO_SIZE:-}"
: "${MAX_ALBUM_LENGTH:-}"
load-config-files load-config-files
# We assign a 1MB buffer to the just-in-time calculated max post size to allow for fields and overhead # We assign a 1MB buffer to the just-in-time calculated max post size to allow for fields and overhead

48
docker/shared/root/docker/install/php-extensions.sh
View file

@ -1,20 +1,14 @@
#!/bin/bash #!/bin/bash
set -ex -o errexit -o nounset -o pipefail set -ex -o errexit -o nounset -o pipefail
# shellcheck disable=SC2223 declare -a pecl_extensions=()
: ${PHP_PECL_EXTENSIONS:=""} readarray -d ' ' -t pecl_extensions < <(echo -n "${PHP_PECL_EXTENSIONS:-}")
readarray -d ' ' -t -O "${#pecl_extensions[@]}" pecl_extensions < <(echo -n "${PHP_PECL_EXTENSIONS_EXTRA:-}")
# shellcheck disable=SC2223 declare -a php_extensions=()
: ${PHP_PECL_EXTENSIONS_EXTRA:=""} readarray -d ' ' -t php_extensions < <(echo -n "${PHP_EXTENSIONS:-}")
readarray -d ' ' -t -O "${#php_extensions[@]}" php_extensions < <(echo -n "${PHP_EXTENSIONS_EXTRA:-}")
# shellcheck disable=SC2223 readarray -d ' ' -t -O "${#php_extensions[@]}" php_extensions < <(echo -n "${PHP_EXTENSIONS_DATABASE:-}")
: ${PHP_EXTENSIONS:=""}
# shellcheck disable=SC2223
: ${PHP_EXTENSIONS_EXTRA:=""}
# shellcheck disable=SC2223
: ${PHP_EXTENSIONS_DATABASE:=""}
# Grab the PHP source code so we can compile against it # Grab the PHP source code so we can compile against it
docker-php-source extract docker-php-source extract
@ -28,33 +22,21 @@ docker-php-ext-configure gd \
# Optional script folks can copy into their image to do any [docker-php-ext-configure] work before the [docker-php-ext-install] # Optional script folks can copy into their image to do any [docker-php-ext-configure] work before the [docker-php-ext-install]
# this can also overwirte the [gd] configure above by simply running it again # this can also overwirte the [gd] configure above by simply running it again
if [[ -f /install/php-extension-configure.sh ]]; then declare -r custom_pre_configure_script=""
if [ ! -x "/install/php-extension-configure.sh" ]; then if [[ -e "${custom_pre_configure_script}" ]]; then
echo >&2 "ERROR: found /install/php-extension-configure.sh but its not executable - please [chmod +x] the file!" if [ ! -x "${custom_pre_configure_script}" ]; then
echo >&2 "ERROR: found ${custom_pre_configure_script} but its not executable - please [chmod +x] the file!"
exit 1 exit 1
fi fi
/install/php-extension-configure.sh "${custom_pre_configure_script}"
fi fi
# Install pecl extensions # Install pecl extensions
pecl install "${PHP_PECL_EXTENSIONS}" "${PHP_PECL_EXTENSIONS_EXTRA}" pecl install "${pecl_extensions[@]}"
# PHP extensions (dependencies) # PHP extensions (dependencies)
# docker-php-ext-install -j "$(nproc)" "${php_extensions[@]}"
# shellcheck disable=SC2086
docker-php-ext-install \
-j "$(nproc)" \
${PHP_EXTENSIONS} \
${PHP_EXTENSIONS_EXTRA} \
${PHP_EXTENSIONS_DATABASE}
# Enable all extensions # Enable all extensions
# docker-php-ext-enable "${pecl_extensions[@]}" "${php_extensions[@]}"
# shellcheck disable=SC2086
docker-php-ext-enable \
${PHP_PECL_EXTENSIONS} \
${PHP_PECL_EXTENSIONS_EXTRA} \
${PHP_EXTENSIONS} \
${PHP_EXTENSIONS_EXTRA} \
${PHP_EXTENSIONS_DATABASE}