diff --git a/.gitignore b/.gitignore index b0f9fac..7d372ff 100644 --- a/.gitignore +++ b/.gitignore @@ -305,6 +305,3 @@ cython_debug/ /collected-static media/ - -# Redis -dump.rdb diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57e8b04..8e57f15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,10 +68,14 @@ container: - static test_python: - <<: *python_test_template + services: + - postgres:13-alpine + variables: + DATABASE_URL: postgres://postgres@postgres/postgres script: - ./manage.py collectstatic --noinput --clear - ./manage.py test + <<: *python_test_template django_checks: <<: *python_test_template diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 7140671..ef7fcc4 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -8,10 +8,20 @@ services: - QUEUE_STORE_URL=redis://redis/0 - DEBUG=true - SECRET_KEY=super-secret-key + - DATABASE_URL=postgres://website:website@db/website volumes: - ../../:/app depends_on: - redis + - db redis: image: redis:6.0 + + db: + image: postgres:13-alpine + environment: + - POSTGRES_PASSWORD=website + - POSTGRES_USER=website + volumes: + - ./volumes/db:/var/lib/postgresql/data diff --git a/requirements/base.in b/requirements/base.in index c0184dd..44e5a19 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -12,3 +12,4 @@ django-rq django-redis wagtail-draftail-snippet gunicorn +psycopg2 diff --git a/requirements/base.txt b/requirements/base.txt index bf11a83..bc39955 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -34,6 +34,7 @@ more-itertools==8.13.0 # via -r requirements/base.in openpyxl==3.0.10 # via tablib packaging==21.3 # via redis pillow==9.2.0 # via wagtail +psycopg2==2.9.3 # via -r requirements/base.in pygments==2.12.0 # via -r requirements/base.in pyparsing==3.0.9 # via packaging pytz==2022.1 # via django-modelcluster, djangorestframework, l18n diff --git a/requirements/dev.txt b/requirements/dev.txt index 599bf7a..e63a2cd 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -48,6 +48,7 @@ pep517==0.12.0 # via build pillow==9.2.0 # via -r requirements/base.txt, wagtail pip-tools==6.8.0 # via -r requirements/dev.in platformdirs==2.5.2 # via black +psycopg2==2.9.3 # via -r requirements/base.txt pycodestyle==2.8.0 # via flake8 pyflakes==2.4.0 # via flake8 pygments==2.12.0 # via -r requirements/base.txt