Skip to content

Commit b6373fc

Browse files
committed
feat: removing old symphony secrets to start over
1 parent da9c992 commit b6373fc

File tree

8 files changed

+34
-61
lines changed

8 files changed

+34
-61
lines changed

config/secrets/prod/prod.APP_SECRET.1cf811.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/secrets/prod/prod.CLIENT_UCO_ID.f08f49.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/secrets/prod/prod.CLIENT_UCO_SECRET.ddd7b1.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/secrets/prod/prod.DATABASE_URL.8ea85a.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/secrets/prod/prod.MAILER_DSN.97e321.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/secrets/prod/prod.encrypt.public.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

config/secrets/prod/prod.list.php

Lines changed: 0 additions & 9 deletions
This file was deleted.

docker/php/docker-entrypoint.sh

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,47 @@ set -e
33

44
# first arg is `-f` or `--some-option`
55
if [ "${1#-}" != "$1" ]; then
6-
set -- php-fpm "$@"
6+
set -- php-fpm "$@"
77
fi
88

99
if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
10-
PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-production"
11-
if [ "$APP_ENV" != 'prod' ]; then
12-
PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-development"
13-
fi
14-
ln -sf "$PHP_INI_RECOMMENDED" "$PHP_INI_DIR/php.ini"
15-
16-
mkdir -p var/cache var/log public/cache public/images
17-
setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var public
18-
setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var public
19-
20-
if [ -z "$SYMFONY_DECRYPTION_SECRET" ]; then
21-
echo "Define SYMFONY_DECRYPTION_SECRET to decrypt secrets"
22-
exit 1
10+
PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-production"
11+
if [ "$APP_ENV" != 'prod' ]; then
12+
PHP_INI_RECOMMENDED="$PHP_INI_DIR/php.ini-development"
2313
fi
14+
ln -sf "$PHP_INI_RECOMMENDED" "$PHP_INI_DIR/php.ini"
15+
16+
mkdir -p var/cache var/log public/cache public/images
17+
setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var public
18+
setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var public
19+
20+
#if [ -z "$SYMFONY_DECRYPTION_SECRET" ]; then
21+
echo "Define SYMFONY_DECRYPTION_SECRET to decrypt secrets"
22+
# exit 1
23+
#fi
2424

2525
bin/console secrets:decrypt-to-local --force --env=prod
2626

27-
echo "Waiting for db to be ready..."
28-
ATTEMPTS_LEFT_TO_REACH_DATABASE=60
29-
until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || bin/console doctrine:query:sql "SELECT 1" > /dev/null 2>&1; do
30-
sleep 1
31-
ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE-1))
32-
echo "Still waiting for db to be ready... Or maybe the db is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left"
33-
done
34-
35-
if [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ]; then
36-
echo "The db is not up or not reachable"
37-
exit 1
38-
else
39-
echo "The db is now ready and reachable"
40-
fi
41-
42-
if ls -A migrations/*.php > /dev/null 2>&1; then
43-
bin/console doctrine:migrations:migrate --no-interaction
44-
fi
45-
46-
bin/console cache:warmup --env=prod
27+
echo "Waiting for db to be ready..."
28+
ATTEMPTS_LEFT_TO_REACH_DATABASE=60
29+
until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || bin/console doctrine:query:sql "SELECT 1" >/dev/null 2>&1; do
30+
sleep 1
31+
ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE - 1))
32+
echo "Still waiting for db to be ready... Or maybe the db is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left"
33+
done
34+
35+
if [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ]; then
36+
echo "The db is not up or not reachable"
37+
exit 1
38+
else
39+
echo "The db is now ready and reachable"
40+
fi
41+
42+
if ls -A migrations/*.php >/dev/null 2>&1; then
43+
bin/console doctrine:migrations:migrate --no-interaction
44+
fi
45+
46+
bin/console cache:warmup --env=prod
4747
fi
4848

4949
exec docker-php-entrypoint "$@"

0 commit comments

Comments
 (0)