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

Merge pull request #5035 from jippi/jippi-fork

Browse source 
Docker fixes
This commit is contained in:
daniel 2024-04-11 20:43:52 -06:00 committed by GitHub
commit 141f6d38a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -237,7 +237,7 @@ USER ${RUNTIME_UID}:${RUNTIME_GID}
# Generate optimized autoloader now that we have all files around # Generate optimized autoloader now that we have all files around
RUN set -ex \ RUN set -ex \
&& composer dump-autoload --optimize && ENABLE_CONFIG_CACHE=false composer dump-autoload --optimize
USER root USER root

4
docker/shared/root/docker/helpers.sh
View file

@ -467,14 +467,14 @@ function await-database-ready()
case "${DB_CONNECTION:-}" in case "${DB_CONNECTION:-}" in
mysql) mysql)
# shellcheck disable=SC2154 # shellcheck disable=SC2154
while ! echo "SELECT 1" | mysql --user="${DB_USERNAME}" --password="${DB_PASSWORD}" --host="${DB_HOST}" "${DB_DATABASE}" --silent >/dev/null; do while ! echo "SELECT 1" | mysql --user="${DB_USERNAME}" --password="${DB_PASSWORD}" --host="${DB_HOST}" --port="${DOCKER_DB_HOST_PORT}" "${DB_DATABASE}" --silent >/dev/null; do
staggered-sleep staggered-sleep
done done
;; ;;
pgsql) pgsql)
# shellcheck disable=SC2154 # shellcheck disable=SC2154
while ! echo "SELECT 1" | PGPASSWORD="${DB_PASSWORD}" psql --user="${DB_USERNAME}" --host="${DB_HOST}" "${DB_DATABASE}" >/dev/null; do while ! echo "SELECT 1" | PGPASSWORD="${DB_PASSWORD}" psql --user="${DB_USERNAME}" --host="${DB_HOST}" --port="${DOCKER_DB_HOST_PORT}" "${DB_DATABASE}" >/dev/null; do
staggered-sleep staggered-sleep
done done
;; ;;