Skip to content

Commit

Permalink
Test removing volume
Browse files Browse the repository at this point in the history
  • Loading branch information
remyvdwereld committed Jul 1, 2024
1 parent b2e16fb commit 7c74f69
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
- run: docker network create zaken_network
- run: docker network create top_and_zaak_backend_bridge
- run: docker-compose -f docker-compose.local.yml up --detach


- run: docker volume rm postgresql-data

- run: sleep 30
- run: bash bin/setup_credentials.sh
- run: ./e2e-tests/fix_models.sh
Expand All @@ -44,7 +48,7 @@ jobs:
working-directory: e2e-tests

- name: Run tests
run: API_HOST=http://localhost:8080/api/v1 python3 -m unittest
run: API_HOST=http://127.0.0.1:8080/api/v1 python3 -m unittest
working-directory: e2e-tests

###################################################
Expand Down
2 changes: 1 addition & 1 deletion app/deploy/docker-entrypoint.development.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ python manage.py collectstatic --no-input
chmod -R 777 /static

# echo Clear tables
python manage.py shell -c "from django.db import connection; cursor = connection.cursor(); cursor.execute('drop table if exists "django_migrations" cascade; drop table if exists "django_content_type" cascade; drop table if exists "auth_permission" cascade; drop table if exists "auth_group" cascade; drop table if exists "auth_group_permissions" cascade; drop table if exists "users_user" cascade; drop table if exists "users_user_groups" cascade; drop table if exists "users_user_user_permissions" cascade; drop table if exists "django_admin_log" cascade; drop table if exists "django_session" cascade;'); cursor.close();"
# python manage.py shell -c "from django.db import connection; cursor = connection.cursor(); cursor.execute('drop table if exists "django_migrations" cascade; drop table if exists "django_content_type" cascade; drop table if exists "auth_permission" cascade; drop table if exists "auth_group" cascade; drop table if exists "auth_group_permissions" cascade; drop table if exists "users_user" cascade; drop table if exists "users_user_groups" cascade; drop table if exists "users_user_user_permissions" cascade; drop table if exists "django_admin_log" cascade; drop table if exists "django_session" cascade;'); cursor.close();"

echo Apply migrations
python manage.py migrate --noinput
Expand Down
3 changes: 0 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@ services:
- 5678:5678
env_file:
- .env
command: bash -c "/app/wait-for.sh zaak-redis:6379 && /app/wait-for.sh database:5432 && /app/deploy/docker-entrypoint.development.sh"
# volumes:
# - ./app:/app
stdin_open: true
tty: true

0 comments on commit 7c74f69

Please sign in to comment.