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

more renaming for clarity

Browse source
This commit is contained in:
Christian Winther 2024-01-05 00:11:20 +00:00
parent d13895a3e0
commit 99e2a045a6
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@
# #
# We also don't need to source `helpers.sh` since it's already available # We also don't need to source `helpers.sh` since it's already available
entrypoint-set-name "${BASH_SOURCE[0]}" entrypoint-set-script-name "${BASH_SOURCE[0]}"
load-config-files load-config-files

2
contrib/docker/shared/root/docker/entrypoint.d/05-templating.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
source /docker/helpers.sh source /docker/helpers.sh
entrypoint-set-name "$0" entrypoint-set-script-name "$0"
# Show [git diff] of templates being rendered (will help verify output) # Show [git diff] of templates being rendered (will help verify output)
: ${ENTRYPOINT_SHOW_TEMPLATE_DIFF:=1} : ${ENTRYPOINT_SHOW_TEMPLATE_DIFF:=1}

2
contrib/docker/shared/root/docker/entrypoint.d/10-storage.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
source /docker/helpers.sh source /docker/helpers.sh
entrypoint-set-name "$0" entrypoint-set-script-name "$0"
# Copy the [storage/] skeleton files over the "real" [storage/] directory so assets are updated between versions # Copy the [storage/] skeleton files over the "real" [storage/] directory so assets are updated between versions
run-as-runtime-user cp --recursive storage.skel/ storage/ run-as-runtime-user cp --recursive storage.skel/ storage/

2
contrib/docker/shared/root/docker/entrypoint.d/15-storage-permissions.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
source /docker/helpers.sh source /docker/helpers.sh
entrypoint-set-name "$0" entrypoint-set-script-name "$0"
# Optionally fix ownership of configured paths # Optionally fix ownership of configured paths
: ${ENTRYPOINT_ENSURE_OWNERSHIP_PATHS:=""} : ${ENTRYPOINT_ENSURE_OWNERSHIP_PATHS:=""}

2
contrib/docker/shared/root/docker/entrypoint.d/20-horizon.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
source /docker/helpers.sh source /docker/helpers.sh
entrypoint-set-name "$0" entrypoint-set-script-name "$0"
run-as-runtime-user php artisan horizon:publish run-as-runtime-user php artisan horizon:publish

2
contrib/docker/shared/root/docker/entrypoint.d/30-cache.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
source /docker/helpers.sh source /docker/helpers.sh
entrypoint-set-name "$0" entrypoint-set-script-name "$0"
run-as-runtime-user php artisan route:cache run-as-runtime-user php artisan route:cache
run-as-runtime-user php artisan view:cache run-as-runtime-user php artisan view:cache

4
contrib/docker/shared/root/docker/entrypoint.sh
View file

@ -15,7 +15,7 @@ export ENTRYPOINT_ROOT
source /docker/helpers.sh source /docker/helpers.sh
# Set the entrypoint name for logging # Set the entrypoint name for logging
entrypoint-set-name "entrypoint.sh" entrypoint-set-script-name "entrypoint.sh"
# Convert ENTRYPOINT_SKIP_SCRIPTS into a native bash array for easier lookup # Convert ENTRYPOINT_SKIP_SCRIPTS into a native bash array for easier lookup
declare -a skip_scripts declare -a skip_scripts
@ -58,7 +58,7 @@ find "${ENTRYPOINT_ROOT}" -follow -type f -print | sort -V | while read -r file;
# the sourced file will (should) than the log prefix, so this restores our own # the sourced file will (should) than the log prefix, so this restores our own
# "global" log prefix once the file is done being sourced # "global" log prefix once the file is done being sourced
entrypoint-restore-name entrypoint-restore-script-name
;; ;;
*.sh) *.sh)

8
contrib/docker/shared/root/docker/helpers.sh
View file

@ -21,15 +21,15 @@ declare -ra dot_env_files=(
# environment keys seen when source dot files (so we can [export] them) # environment keys seen when source dot files (so we can [export] them)
declare -ga seen_dot_env_variables=() declare -ga seen_dot_env_variables=()
# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-name] # @description Restore the log prefix to the previous value that was captured in [entrypoint-set-script-name ]
# @arg $1 string The name (or path) of the entrypoint script being run # @arg $1 string The name (or path) of the entrypoint script being run
function entrypoint-set-name() { function entrypoint-set-script-name() {
log_prefix_previous="${log_prefix}" log_prefix_previous="${log_prefix}"
log_prefix="ENTRYPOINT - [$(get-entrypoint-script-name $1)] - " log_prefix="ENTRYPOINT - [$(get-entrypoint-script-name $1)] - "
} }
# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-name] # @description Restore the log prefix to the previous value that was captured in [entrypoint-set-script-name ]
function entrypoint-restore-name() { function entrypoint-restore-script-name() {
log_prefix="${log_prefix_previous}" log_prefix="${log_prefix_previous}"
} }