Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🔧 [open-zaak/open-zaak#1629] Refactor base settings #17

Merged
merged 6 commits into from
Jul 11, 2024
Merged

🔧 [open-zaak/open-zaak#1629] Refactor base settings #17

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43126f8
:arrow_up: Upgrade open-api-framework to 0.6.0
stevenbal Jun 27, 2024
c0a179d
:wrench: [open-zaak/open-zaak#1629] Refactor base settings
stevenbal Jun 27, 2024
8d96dfd
:whale: Fix docker-compose setup
stevenbal Jun 27, 2024
4ec5b12
:wrench: Remove unused settings
stevenbal Jun 28, 2024
ce4e504
:wrench: Remove django.contrib.sites explicitly
stevenbal Jul 5, 2024
5f1b466
:memo: Add warnings for redis/2fa to changelog
stevenbal Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ services:
volumes:
- ./docker-init-db.sql:/docker-entrypoint-initdb.d/init_db.sql

redis:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add warning to CHANGELOG that redis is needed now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And could you also add warning about using 2FA in the CHANGELOG (We use it now, right?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joeribekker Do you think it's needed to add warnings? Afaik there hasn't been an official release of referentielijsten yet

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a warning in the changelog can't hurt though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added warnings for them

image: redis

web:
build: .
image: maykinmedia/referentielijsten-api:latest
Expand All @@ -21,12 +24,17 @@ services:
- DB_NAME=referentielijsten
- DB_USER=referentielijsten
- DB_HOST=db
- CACHE_DEFAULT=redis:6379/0
- CACHE_AXES=redis:6379/0
- SUBPATH=${SUBPATH:-/}
- DISABLE_2FA=${DISABLE_2FA:-True}
# Only allow all hosts for development/testing purposes!
- ALLOWED_HOSTS=*
ports:
- 8000:8000
depends_on:
- db
- redis

# See: src/referentielijsten/conf/docker.py
# Optional containers below:
Expand Down
13 changes: 12 additions & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,14 @@ django==4.2.11
# via
# commonground-api-common
# django-admin-index
# django-appconf
# django-axes
# django-cors-headers
# django-filter
# django-formtools
# django-import-export
# django-jsonform
# django-log-outgoing-requests
# django-markup
# django-otp
# django-phonenumber-field
Expand All @@ -88,6 +90,7 @@ django==4.2.11
# django-relativedelta
# django-rest-framework-condition
# django-sendfile2
# django-setup-configuration
# django-simple-certmanager
# django-solo
# django-two-factor-auth
Expand All @@ -104,6 +107,8 @@ django==4.2.11
# zgw-consumers
django-admin-index==3.1.1
# via open-api-framework
django-appconf==1.0.6
# via django-log-outgoing-requests
django-axes==6.4.0
# via open-api-framework
django-cors-headers==4.3.1
Expand All @@ -120,6 +125,8 @@ django-jsonform==2.22.0
# via
# mozilla-django-oidc-db
# open-api-framework
django-log-outgoing-requests==0.6.1
# via open-api-framework
django-markup==1.8.1
# via open-api-framework
django-ordered-model==3.7.4
Expand All @@ -138,11 +145,14 @@ django-rest-framework-condition==0.1.1
# via commonground-api-common
django-sendfile2==0.7.1
# via django-privates
django-setup-configuration==0.1.0
# via open-api-framework
django-simple-certmanager==2.0.0
# via zgw-consumers
django-solo==2.2.0
# via
# commonground-api-common
# django-log-outgoing-requests
# mozilla-django-oidc-db
# notifications-api-common
# zgw-consumers
Expand Down Expand Up @@ -224,7 +234,7 @@ mozilla-django-oidc-db==0.15.0
# via open-api-framework
notifications-api-common==0.2.2
# via commonground-api-common
open-api-framework==0.2.0
open-api-framework==0.6.0
# via -r requirements/base.in
openpyxl==3.1.4
# via tablib
Expand Down Expand Up @@ -286,6 +296,7 @@ requests==2.31.0
# ape-pie
# commonground-api-common
# coreapi
# django-log-outgoing-requests
# gemma-zds-client
# mozilla-django-oidc
# open-api-framework
Expand Down
19 changes: 18 additions & 1 deletion requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,14 @@ django==4.2.11
# -r requirements/base.txt
# commonground-api-common
# django-admin-index
# django-appconf
# django-axes
# django-cors-headers
# django-filter
# django-formtools
# django-import-export
# django-jsonform
# django-log-outgoing-requests
# django-markup
# django-otp
# django-phonenumber-field
Expand All @@ -134,6 +136,7 @@ django==4.2.11
# django-relativedelta
# django-rest-framework-condition
# django-sendfile2
# django-setup-configuration
# django-simple-certmanager
# django-solo
# django-two-factor-auth
Expand All @@ -152,6 +155,10 @@ django-admin-index==3.1.1
# via
# -r requirements/base.txt
# open-api-framework
django-appconf==1.0.6
# via
# -r requirements/base.txt
# django-log-outgoing-requests
django-axes==6.4.0
# via
# -r requirements/base.txt
Expand All @@ -176,6 +183,10 @@ django-jsonform==2.22.0
# -r requirements/base.txt
# mozilla-django-oidc-db
# open-api-framework
django-log-outgoing-requests==0.6.1
# via
# -r requirements/base.txt
# open-api-framework
django-markup==1.8.1
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -212,6 +223,10 @@ django-sendfile2==0.7.1
# via
# -r requirements/base.txt
# django-privates
django-setup-configuration==0.1.0
# via
# -r requirements/base.txt
# open-api-framework
django-simple-certmanager==2.0.0
# via
# -r requirements/base.txt
Expand All @@ -220,6 +235,7 @@ django-solo==2.2.0
# via
# -r requirements/base.txt
# commonground-api-common
# django-log-outgoing-requests
# mozilla-django-oidc-db
# notifications-api-common
# zgw-consumers
Expand Down Expand Up @@ -377,7 +393,7 @@ notifications-api-common==0.2.2
# via
# -r requirements/base.txt
# commonground-api-common
open-api-framework==0.2.0
open-api-framework==0.6.0
# via -r requirements/base.txt
openpyxl==3.1.4
# via
Expand Down Expand Up @@ -485,6 +501,7 @@ requests==2.31.0
# ape-pie
# commonground-api-common
# coreapi
# django-log-outgoing-requests
# gemma-zds-client
# mozilla-django-oidc
# open-api-framework
Expand Down
22 changes: 21 additions & 1 deletion requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ django==4.2.11
# -r requirements/ci.txt
# commonground-api-common
# django-admin-index
# django-appconf
# django-axes
# django-cors-headers
# django-debug-toolbar
Expand All @@ -169,6 +170,7 @@ django==4.2.11
# django-formtools
# django-import-export
# django-jsonform
# django-log-outgoing-requests
# django-markup
# django-otp
# django-phonenumber-field
Expand All @@ -177,6 +179,7 @@ django==4.2.11
# django-relativedelta
# django-rest-framework-condition
# django-sendfile2
# django-setup-configuration
# django-simple-certmanager
# django-solo
# django-two-factor-auth
Expand All @@ -196,6 +199,11 @@ django-admin-index==3.1.1
# -c requirements/ci.txt
# -r requirements/ci.txt
# open-api-framework
django-appconf==1.0.6
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# django-log-outgoing-requests
django-axes==6.4.0
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -231,6 +239,11 @@ django-jsonform==2.22.0
# -r requirements/ci.txt
# mozilla-django-oidc-db
# open-api-framework
django-log-outgoing-requests==0.6.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# open-api-framework
django-markup==1.8.1
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -276,6 +289,11 @@ django-sendfile2==0.7.1
# -c requirements/ci.txt
# -r requirements/ci.txt
# django-privates
django-setup-configuration==0.1.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# open-api-framework
django-simple-certmanager==2.0.0
# via
# -c requirements/ci.txt
Expand All @@ -286,6 +304,7 @@ django-solo==2.2.0
# -c requirements/ci.txt
# -r requirements/ci.txt
# commonground-api-common
# django-log-outgoing-requests
# mozilla-django-oidc-db
# notifications-api-common
# zgw-consumers
Expand Down Expand Up @@ -506,7 +525,7 @@ notifications-api-common==0.2.2
# -c requirements/ci.txt
# -r requirements/ci.txt
# commonground-api-common
open-api-framework==0.2.0
open-api-framework==0.6.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -659,6 +678,7 @@ requests==2.31.0
# ape-pie
# commonground-api-common
# coreapi
# django-log-outgoing-requests
# gemma-zds-client
# mozilla-django-oidc
# open-api-framework
Expand Down
Loading
Loading