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.

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

Caddy server setup #233

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Caddy server setup #233

wants to merge 10 commits into from

Conversation

ccjoel
Copy link
Contributor

@ccjoel ccjoel commented Jan 3, 2024

The purpose of this work is to add a built-in prod-like router within the dojo-stack. Currently for staging/prod/deployments we use an external nginx server with a mix of in-code and in-flight configuration. Setting this up would mean we can start the stack without the need to wrap with nginx or other servers separate from our stack.

Uses a prodv2 docker profile. We can/could merge, try it out, and either eventually remove the profile or extend our docker profiles usage.

All of it will run by running the following:

docker compose --profile prodv2 up -d

@ccjoel ccjoel marked this pull request as ready for review January 8, 2024 15:47
@ccjoel ccjoel requested a review from brandomr January 8, 2024 15:47
router/Caddyfile Outdated
reverse_proxy {$DOJO_HOST}:80
}

redir /api/ai-docs /api/ai-docs/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can remove this redirect rule, as boxytas/knowledge is part of the Dojo API now (which is covered by the above /api/dojo rule).

@@ -218,7 +220,38 @@ services:
- dojo-stack
ports:
- 8012:8012
# profiles:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggestion, where we could enable testmos on local dev only.

@@ -193,6 +193,8 @@ services:
- ${PWD}/data:/data
networks:
dojo-stack: {}
# profiles:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggestion, where we could enable minio on local dev only.

ccjoel and others added 6 commits January 10, 2024 15:24
* Once a non-pdf is uploaded, converted, and processed, replace the original non-pdf file references on ES with the PDF paths/filenames, in order to reference and display the PDF on the document knowledge UI (#242)

* Small quality-of-life changes (logging of validation errors on api logs); fixed response job get status schema to use valid rq statuses (#244)

* Updates data modeling dataset selector to include a filter, makes name column wider, improves expandable datagrid cell across app (#243)

* Data Modeling Error Handling (#245)

* Adds initial Data Modeling error handling with unstyled error card

* Styles modeler error card, changes button to refresh page and send user back to the dataset selection screen

* Improves modeling dataset selection screen loading/error state

* Slight styling tweaks to data modeling error card, adjust error catching to be broader

* Changes IFPRI branding to CGIAR branding (#246)

* Changes IFPRI branding to CGIAR branding

* Changes 'digital twin' image border color

---------

Co-authored-by: Joel Quiles <[email protected]>
Co-authored-by: adamgilg <[email protected]>
* Once a non-pdf is uploaded, converted, and processed, replace the original non-pdf file references on ES with the PDF paths/filenames, in order to reference and display the PDF on the document knowledge UI (#242)

* Small quality-of-life changes (logging of validation errors on api logs); fixed response job get status schema to use valid rq statuses (#244)

* Updates data modeling dataset selector to include a filter, makes name column wider, improves expandable datagrid cell across app (#243)

* Data Modeling Error Handling (#245)

* Adds initial Data Modeling error handling with unstyled error card

* Styles modeler error card, changes button to refresh page and send user back to the dataset selection screen

* Improves modeling dataset selection screen loading/error state

* Slight styling tweaks to data modeling error card, adjust error catching to be broader

* Changes IFPRI branding to CGIAR branding (#246)

* Changes IFPRI branding to CGIAR branding

* Changes 'digital twin' image border color

* CGIAR Whitelabel: Updates landing page font weight

---------

Co-authored-by: Joel Quiles <[email protected]>
Co-authored-by: adamgilg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants