-
Notifications
You must be signed in to change notification settings - Fork 26
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.
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
Fix docker compose setup for local development #4489
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0e5c0e6
:whale: Remove manual actions by loading fixtures in Open Zaak automa…
sergei-maertens 2eb4f7e
:whale: Update to Open Zaak 1.13
sergei-maertens 21ab073
:pencil: Document Open Zaak fixture dump command
sergei-maertens a6586c6
:whale: Update and clean up docker setup for objects API
sergei-maertens d13ae74
:whale: Fix proxy-setup with docker-compose
sergei-maertens File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,97 +1,98 @@ | ||
| [ | ||
| { | ||
| "model": "core.objecttype", | ||
| "pk": 1, | ||
| "fields": { | ||
| "service": 1, | ||
| "uuid": "8e46e0a5-b1b4-449b-b9e9-fa3cea655f48", | ||
| "_name": "Person" | ||
| } | ||
| }, | ||
| { | ||
| "model": "core.objecttype", | ||
| "pk": 2, | ||
| "fields": { | ||
| "service": 1, | ||
| "uuid": "527b8408-7421-4808-a744-43ccb7bdaaa2", | ||
| "_name": "File uploads" | ||
| } | ||
| }, | ||
| { | ||
| "model": "core.objecttype", | ||
| "pk": 3, | ||
| "fields": { | ||
| "service": 1, | ||
| "uuid": "f1dde4fe-b7f9-46dc-84ae-429ae49e3705", | ||
| "_name": "Geo in data" | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.tokenauth", | ||
| "pk": "7657474c3d75f56ae0abd0d1bf7994b09964dca9", | ||
| "fields": { | ||
| "contact_person": "Admin", | ||
| "email": "[email protected]", | ||
| "organization": "", | ||
| "last_modified": "2023-10-24T08:58:51.291Z", | ||
| "created": "2023-10-24T08:58:51.291Z", | ||
| "application": "", | ||
| "administration": "" | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.permission", | ||
| "pk": 1, | ||
| "fields": { | ||
| "token_auth": "7657474c3d75f56ae0abd0d1bf7994b09964dca9", | ||
| "object_type": 1, | ||
| "mode": "read_and_write", | ||
| "use_fields": false, | ||
| "fields": null | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.permission", | ||
| "pk": 2, | ||
| "fields": { | ||
| "token_auth": "7657474c3d75f56ae0abd0d1bf7994b09964dca9", | ||
| "object_type": 2, | ||
| "mode": "read_and_write", | ||
| "use_fields": false, | ||
| "fields": null | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.permission", | ||
| "pk": 3, | ||
| "fields": { | ||
| "token_auth": "7657474c3d75f56ae0abd0d1bf7994b09964dca9", | ||
| "object_type": 3, | ||
| "mode": "read_and_write", | ||
| "use_fields": false, | ||
| "fields": null | ||
| } | ||
| }, | ||
| { | ||
| "model": "zgw_consumers.service", | ||
| "pk": 1, | ||
| "fields": { | ||
| "label": "Local objecttypes", | ||
| "oas": "https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/src/objecttypes/api/v2/openapi.yaml", | ||
| "oas_file": "", | ||
| "uuid": "ee08faa2-4cd1-45f6-ba16-d50872cf5cf2", | ||
| "api_type": "orc", | ||
| "api_root": "http://objecttypes-web:8000/api/v2/", | ||
| "client_id": "", | ||
| "secret": "", | ||
| "auth_type": "api_key", | ||
| "header_key": "Authorization", | ||
| "header_value": "Token 171be5abaf41e7856b423ad513df1ef8f867ff48", | ||
| "nlx": "", | ||
| "user_id": "", | ||
| "user_representation": "", | ||
| "client_certificate": null, | ||
| "server_certificate": null | ||
| } | ||
| } | ||
| ] | ||
| [ | ||
| { | ||
| "model": "core.objecttype", | ||
| "pk": 1, | ||
| "fields": { | ||
| "service": 1, | ||
| "uuid": "8e46e0a5-b1b4-449b-b9e9-fa3cea655f48", | ||
| "_name": "Person" | ||
| } | ||
| }, | ||
| { | ||
| "model": "core.objecttype", | ||
| "pk": 2, | ||
| "fields": { | ||
| "service": 1, | ||
| "uuid": "527b8408-7421-4808-a744-43ccb7bdaaa2", | ||
| "_name": "File uploads" | ||
| } | ||
| }, | ||
| { | ||
| "model": "core.objecttype", | ||
| "pk": 3, | ||
| "fields": { | ||
| "service": 1, | ||
| "uuid": "f1dde4fe-b7f9-46dc-84ae-429ae49e3705", | ||
| "_name": "Geo in data" | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.tokenauth", | ||
| "pk": 1, | ||
| "fields": { | ||
| "token": "7657474c3d75f56ae0abd0d1bf7994b09964dca9", | ||
| "contact_person": "Admin", | ||
| "email": "[email protected]", | ||
| "organization": "", | ||
| "last_modified": "2023-10-24T08:58:51.291Z", | ||
| "created": "2023-10-24T08:58:51.291Z", | ||
| "application": "", | ||
| "administration": "" | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.permission", | ||
| "pk": 1, | ||
| "fields": { | ||
| "token_auth": 1, | ||
| "object_type": 1, | ||
| "mode": "read_and_write", | ||
| "use_fields": false, | ||
| "fields": null | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.permission", | ||
| "pk": 2, | ||
| "fields": { | ||
| "token_auth": 1, | ||
| "object_type": 2, | ||
| "mode": "read_and_write", | ||
| "use_fields": false, | ||
| "fields": null | ||
| } | ||
| }, | ||
| { | ||
| "model": "token.permission", | ||
| "pk": 3, | ||
| "fields": { | ||
| "token_auth": 1, | ||
| "object_type": 3, | ||
| "mode": "read_and_write", | ||
| "use_fields": false, | ||
| "fields": null | ||
| } | ||
| }, | ||
| { | ||
| "model": "zgw_consumers.service", | ||
| "pk": 1, | ||
| "fields": { | ||
| "label": "Local objecttypes", | ||
| "oas": "https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/src/objecttypes/api/v2/openapi.yaml", | ||
| "oas_file": "", | ||
| "uuid": "ee08faa2-4cd1-45f6-ba16-d50872cf5cf2", | ||
| "api_type": "orc", | ||
| "api_root": "http://objecttypes-web:8000/api/v2/", | ||
| "client_id": "", | ||
| "secret": "", | ||
| "auth_type": "api_key", | ||
| "header_key": "Authorization", | ||
| "header_value": "Token 171be5abaf41e7856b423ad513df1ef8f867ff48", | ||
| "nlx": "", | ||
| "user_id": "", | ||
| "user_representation": "", | ||
| "client_certificate": null, | ||
| "server_certificate": null | ||
| } | ||
| } | ||
| ] |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see the
v2.3.2in the repo. Can we assume that from somewhere else?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is available here: https://hub.docker.com/r/maykinmedia/objects-api/tags
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah I had to look at docker hub / git tags too, it's not in the changelog