hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Quote E2E entrypoint variables

Browse source
This commit is contained in:
Lain Soykaf 2026-05-25 16:04:53 +04:00
commit 8a410bf49f
No known key found for this signature in database
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
docker-entrypoint-e2e.sh
View file

@ -5,12 +5,12 @@ SEED_SENTINEL_PATH=/var/lib/pleroma/.e2e_seeded
CONFIG_OVERRIDE_PATH=/var/lib/pleroma/config.exs CONFIG_OVERRIDE_PATH=/var/lib/pleroma/config.exs
echo '-- Waiting for database...' echo '-- Waiting for database...'
while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma} -t 1; do while ! pg_isready -U "${DB_USER:-pleroma}" -d "postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma}" -t 1; do
sleep 1s sleep 1s
done done
echo '-- Writing E2E config overrides...' echo '-- Writing E2E config overrides...'
cat > $CONFIG_OVERRIDE_PATH <<EOF cat > "$CONFIG_OVERRIDE_PATH" <<EOF
import Config import Config
config :pleroma, Pleroma.Captcha, config :pleroma, Pleroma.Captcha,
@ -30,9 +30,9 @@ echo '-- Starting!'
PLEROMA_PID=$! PLEROMA_PID=$!
cleanup() { cleanup() {
if kill -0 $PLEROMA_PID 2>/dev/null; then if kill -0 "$PLEROMA_PID" 2>/dev/null; then
kill -TERM $PLEROMA_PID kill -TERM "$PLEROMA_PID"
wait $PLEROMA_PID || true wait "$PLEROMA_PID" || true
fi fi
} }
@ -48,23 +48,23 @@ for _i in $(seq 1 120); do
sleep 1s sleep 1s
done done
if [ $api_ok != true ]; then if [ "$api_ok" != true ]; then
echo 'Timed out waiting for Pleroma API to become available' echo 'Timed out waiting for Pleroma API to become available'
exit 1 exit 1
fi fi
if [ ! -f $SEED_SENTINEL_PATH ]; then if [ ! -f "$SEED_SENTINEL_PATH" ]; then
if [ -n ${E2E_ADMIN_USERNAME:-} ] && [ -n ${E2E_ADMIN_PASSWORD:-} ] && [ -n ${E2E_ADMIN_EMAIL:-} ]; then if [ -n "${E2E_ADMIN_USERNAME:-}" ] && [ -n "${E2E_ADMIN_PASSWORD:-}" ] && [ -n "${E2E_ADMIN_EMAIL:-}" ]; then
echo '-- Seeding admin user' $E2E_ADMIN_USERNAME '...' echo '-- Seeding admin user' "$E2E_ADMIN_USERNAME" '...'
if ! /opt/pleroma/bin/pleroma_ctl user new $E2E_ADMIN_USERNAME $E2E_ADMIN_EMAIL --admin --password $E2E_ADMIN_PASSWORD -y; then if ! /opt/pleroma/bin/pleroma_ctl user new "$E2E_ADMIN_USERNAME" "$E2E_ADMIN_EMAIL" --admin --password "$E2E_ADMIN_PASSWORD" -y; then
echo '-- User already exists or creation failed, ensuring admin + confirmed...' echo '-- User already exists or creation failed, ensuring admin + confirmed...'
/opt/pleroma/bin/pleroma_ctl user set $E2E_ADMIN_USERNAME --admin --confirmed /opt/pleroma/bin/pleroma_ctl user set "$E2E_ADMIN_USERNAME" --admin --confirmed
fi fi
else else
echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)' echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)'
fi fi
touch $SEED_SENTINEL_PATH touch "$SEED_SENTINEL_PATH"
fi fi
wait $PLEROMA_PID wait "$PLEROMA_PID"