diff --git a/install.sh b/install.sh index c6cd9d5f..7ea469df 100755 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ set -e python3 -m venv .env source ./.env/bin/activate pip install -r src/requirements/production.txt -r src/requirements/dev.txt -pip install psycopg2 pylibmc +pip install psycopg2 sudo pacman -Sy librsvg ./start_db.sh db diff --git a/local_run/compose.yml b/local_run/compose.yml index 6d2d9cd1..6af7d37d 100644 --- a/local_run/compose.yml +++ b/local_run/compose.yml @@ -15,7 +15,7 @@ x-healthcheck_defaults: &healthcheck_defaults interval: 10s timeout: 2s retries: 5 - start_period: 5s + start_period: 10s x-c3nav-defaults: &c3nav-defaults build: context: .. @@ -81,7 +81,7 @@ services: image: postgres:16 healthcheck: <<: *healthcheck_defaults - test: pg_isready -U postgres + test: pg_isready -U postgres && psql -U postgres -d ${C3NAV_DATABASE_NAME:-c3nav} -c "SELECT 1;" environment: POSTGRES_DB: ${C3NAV_DATABASE_NAME:-c3nav} POSTGRES_HOST_AUTH_METHOD: "trust" diff --git a/local_run/up.sh b/local_run/up.sh index 124a289e..aed501f3 100755 --- a/local_run/up.sh +++ b/local_run/up.sh @@ -12,17 +12,13 @@ docker volume create c3nav-redis # Start only postgres and redis first (no build since we pre-built) docker compose up -d postgres redis -sleep 10 - +sleep 5 cat ./db/auth_user.sql | docker exec -i local_run-postgres-1 su - postgres -c 'psql c3nav' -# Create Django superuser - -sleep 1 # Load database dump before starting the main app -cat ./db/dump.sql | docker exec -i local_run-postgres-1 su - postgres -c 'psql c3nav' +cat ./db/dump.sql | docker exec -i local_run-postgres-1 su - postgres -c 'psql c3nav' > /dev/null # Fix geometry access permissions for anonymous users docker exec -i local_run-postgres-1 psql -U postgres -d c3nav -c "UPDATE mapdata_space SET base_mapdata_accessible = true;" @@ -38,7 +34,6 @@ user.set_password('admin') user.save() print('Password set successfully for user:', user.username) \" | /app/env/bin/python manage.py shell" -sleep 30 # Fake apply all migrations since we loaded from dump