diff --git a/docker-compose.yml b/docker-compose.yml index 3caf89f8..b08354f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,26 +14,8 @@ services: environment: - DJANGO_SETTINGS_MODULE=objecttypes.conf.docker - SECRET_KEY=${SECRET_KEY:-fgv=c0hz&tl*8*3m3893@m+1pstrvidc9e^5@fpspmg%cy$15d} + - ALLOWED_HOSTS=* ports: - 8000:8000 depends_on: - db - -# See: src/objecttypes/conf/docker.py -# Optional containers below: -# elasticsearch: -# # NOTE: No persistance storage configured. -# # See: https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html -# image: docker.elastic.co/elasticsearch/elasticsearch:6.2.4 -# container_name: elasticsearch -# environment: -# - discovery.type=single-node -# - cluster.routing.allocation.disk.threshold_enabled=false -# ports: -# - 9200:9200 -# redis: -# # NOTE: No persistance storage configured. -# # See: https://hub.docker.com/_/redis/ -# image: redis -# ports: -# - 6379:6379 diff --git a/requirements/base.txt b/requirements/base.txt index f6d12115..44012b56 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -92,7 +92,7 @@ django==3.2.20 # zgw-consumers django-admin-index==3.0.0 # via -r requirements/base.in -django-axes==6.0.1 +django-axes==5.41.1 # via -r requirements/base.in django-choices==1.7.2 # via @@ -106,6 +106,8 @@ django-formtools==2.4.1 # via maykin-django-two-factor-auth django-hijack==3.3.0 # via -r requirements/base.in +django-ipware==6.0.3 + # via django-axes django-jsonform==2.21.5 # via mozilla-django-oidc-db django-jsonsuit==0.5.0 @@ -155,7 +157,7 @@ drf-nested-routers==0.93.4 # via # -r requirements/base.in # commonground-api-common -drf-spectacular==0.26.2 +drf-spectacular==0.16.0 # via -r requirements/base.in drf-yasg==1.21.5 # via commonground-api-common @@ -239,6 +241,8 @@ python-decouple==3.8 # via -r requirements/base.in python-dotenv==1.0.0 # via -r requirements/base.in +python-ipware==2.0.1 + # via django-ipware pytz==2023.3 # via # -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index 7ab0bd25..95606130 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -128,7 +128,7 @@ django==3.2.20 # zgw-consumers django-admin-index==3.0.0 # via -r requirements/base.txt -django-axes==6.0.1 +django-axes==5.41.1 # via -r requirements/base.txt django-choices==1.7.2 # via @@ -144,6 +144,10 @@ django-formtools==2.4.1 # maykin-django-two-factor-auth django-hijack==3.3.0 # via -r requirements/base.txt +django-ipware==6.0.3 + # via + # -r requirements/base.txt + # django-axes django-jenkins==0.110.0 # via -r requirements/test-tools.in django-jsonform==2.21.5 @@ -217,7 +221,7 @@ drf-nested-routers==0.93.4 # via # -r requirements/base.txt # commonground-api-common -drf-spectacular==0.26.2 +drf-spectacular==0.16.0 # via -r requirements/base.txt drf-yasg==1.21.5 # via @@ -358,6 +362,10 @@ python-decouple==3.8 # via -r requirements/base.txt python-dotenv==1.0.0 # via -r requirements/base.txt +python-ipware==2.0.1 + # via + # -r requirements/base.txt + # django-ipware pytz==2023.3 # via # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 187a1f7a..84059270 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -148,7 +148,7 @@ django==3.2.20 # zgw-consumers django-admin-index==3.0.0 # via -r requirements/ci.txt -django-axes==6.0.1 +django-axes==5.41.1 # via -r requirements/ci.txt django-choices==1.7.2 # via @@ -168,6 +168,10 @@ django-formtools==2.4.1 # maykin-django-two-factor-auth django-hijack==3.3.0 # via -r requirements/ci.txt +django-ipware==6.0.3 + # via + # -r requirements/ci.txt + # django-axes django-jenkins==0.110.0 # via -r requirements/ci.txt django-jsonform==2.21.5 @@ -245,7 +249,7 @@ drf-nested-routers==0.93.4 # via # -r requirements/ci.txt # commonground-api-common -drf-spectacular==0.26.2 +drf-spectacular==0.16.0 # via -r requirements/ci.txt drf-yasg==1.21.5 # via @@ -416,6 +420,10 @@ python-decouple==3.8 # via -r requirements/ci.txt python-dotenv==1.0.0 # via -r requirements/ci.txt +python-ipware==2.0.1 + # via + # -r requirements/ci.txt + # django-ipware pytz==2023.3 # via # -r requirements/ci.txt