joshlaymon/Illustrations
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#1) from develop into main

Browse Source 
Reviewed-on: https://git.lan/joshlaymon/Illustrations/pulls/1
This commit is contained in:
Joshua Laymon 2025-09-07 03:43:12 +00:00
commit 95391f82d5
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env
View File

@ -14,10 +14,10 @@ DJANGO_ALLOWED_HOSTS=*
CSRF_TRUSTED_ORIGINS= CSRF_TRUSTED_ORIGINS=
ADMIN_USERNAME=joshlaymon ADMIN_USERNAME=joshlaymon
ADMIN_PASSWORD=1993llelMO65026illustrations ADMIN_PASSWORD=1993llelMO65026illustrations
USER_USERNAME=boblaymon # USER_USERNAME=boblaymon
USER_PASSWORD=power8 # USER_PASSWORD=power8
# Seed import # Seed import
IMPORT_SEED_ON_START=true IMPORT_SEED_ON_START=false
SEED_CSV=/data/imports/illustrations_seed.csv # SEED_CSV=/data/imports/illustrations_seed.csv
OPENAI_API_KEY=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 OPENAI_API_KEY=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

11
web/entrypoint.sh
View File

@ -1,14 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
echo "Waiting for Postgres..." echo "Waiting for Postgres..."
until pg_isready -h "${POSTGRES_HOST:-db}" -p "${POSTGRES_PORT:-5432}" -U "${POSTGRES_USER:-illustrations}" >/dev/null 2>&1; do until pg_isready -h "${POSTGRES_HOST:-db}" -p "${POSTGRES_PORT:-5432}" -U "${POSTGRES_USER:-illustrations}" >/dev/null 2>&1; do
sleep 1 sleep 1
done done
python manage.py migrate python manage.py migrate
python manage.py init_users
if [ "${IMPORT_SEED_ON_START}" = "true" ] && [ -f "${SEED_CSV}" ] && [ ! -f /data/imports/.seed_done ]; then python manage.py runserver 0.0.0.0:8000
echo "Seeding from ${SEED_CSV}..."
python manage.py import_seed "${SEED_CSV}"
touch /data/imports/.seed_done
fi
python manage.py runserver 0.0.0.0:8000

2
web/requirements.txt
View File

@ -1,4 +1,4 @@
Django==5.0.6 Django==5.0.6
psycopg2-binary==2.9.9 psycopg2-binary==2.9.9
python-dateutil==2.9.0.post0 python-dateutil==2.9.0.post0
openai>=1.0.0 openai>=1.0,<2.0

2
web/version.txt
View File

@ -1 +1 @@
v4.1.20 v4.1.21