fix: backport latest changes made in API Platform (#121)
This commit is contained in:
parent
2e9d893de2
commit
1a286f124f
@ -17,9 +17,14 @@ RUN apk add --no-cache \
|
||||
file \
|
||||
gettext \
|
||||
git \
|
||||
gnu-libiconv \
|
||||
jq \
|
||||
;
|
||||
|
||||
# install gnu-libiconv and set LD_PRELOAD env to make iconv work fully on Alpine image.
|
||||
# see https://github.com/docker-library/php/issues/240#issuecomment-763112749
|
||||
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
|
||||
|
||||
ARG APCU_VERSION=5.1.19
|
||||
RUN set -eux; \
|
||||
apk add --no-cache --virtual .build-deps \
|
||||
|
@ -32,7 +32,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
|
||||
if grep -q ^DATABASE_URL= .env; then
|
||||
echo "Waiting for db to be ready..."
|
||||
ATTEMPTS_LEFT_TO_REACH_DATABASE=60
|
||||
until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(bin/console doctrine:query:sql "SELECT 1" 2>&1); do
|
||||
until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(bin/console dbal:run-sql "SELECT 1" 2>&1); do
|
||||
if [ $? -eq 255 ]; then
|
||||
# If the Doctrine command exits with 255, an unrecoverable error occurred
|
||||
ATTEMPTS_LEFT_TO_REACH_DATABASE=0
|
||||
|
Loading…
x
Reference in New Issue
Block a user