Work on a proper mquery package #365
Merged
Conversation
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
|
Tests fixed, now just fix dev dockerfiles, and figure out how to build it
Also refactor the dockerfiles, we just need to |
msm-code
commented
Jan 24, 2024
| @@ -8,5 +8,4 @@ RUN apt update; apt install -y cmake | |||
| COPY requirements.txt src/plugins/requirements-*.txt /tmp/ | |||
| RUN ls /tmp/requirements*.txt | xargs -i,, pip --no-cache-dir install -r ,, | |||
|
|
|||
| # ./src is expected to be mounted with a docker volume | |||
| CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "5000", "--reload"] | |||
| CMD pip install -e /usr/src/app && uvicorn mquery.app:app --host 0.0.0.0 --port 5000 --reload | |||
There was a problem hiding this comment.
This is only a dev dockerfile, we need to install the pip package in editable mode to have hot reload.
| @@ -4,6 +4,5 @@ RUN npm install -g serve | |||
| COPY src/mqueryfront /app | |||
| WORKDIR /app | |||
| RUN npm install --legacy-peer-deps && \ | |||
| mkdir ./public/monaco-vs && \ | |||
| cp -r ./node_modules/monaco-editor/min/vs/. ./public/monaco-vs | |||
| cp -r ./node_modules/monaco-editor/min/vs ./public/monaco-vs | |||
There was a problem hiding this comment.
this cp step will be fixed in a follow-up PR anyway.
| @@ -4,20 +4,18 @@ RUN npm install -g serve | |||
| COPY src/mqueryfront /app | |||
| WORKDIR /app | |||
| RUN npm install --legacy-peer-deps && \ | |||
| mkdir ./public/monaco-vs && \ | |||
| cp -r ./node_modules/monaco-editor/min/vs/. ./public/monaco-vs && \ | |||
| cp -r ./node_modules/monaco-editor/min/vs ./public/monaco-vs && \ | |||
There was a problem hiding this comment.
this cp step will be fixed in a follow-up PR anyway.
nazywam
approved these changes
Jan 24, 2024
msm-cert
reviewed
Oct 2, 2024
| @@ -8,5 +8,4 @@ RUN apt update; apt install -y cmake | |||
| COPY requirements.txt src/plugins/requirements-*.txt /tmp/ | |||
| RUN ls /tmp/requirements*.txt | xargs -i,, pip --no-cache-dir install -r ,, | |||
|
|
|||
| # ./src is expected to be mounted with a docker volume | |||
| CMD ["./autoreload", "python3", "daemon.py"] | |||
| CMD pip install -e /usr/src/app && mquery-daemon | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
WIP PR, I still need to update documentation etc. But I've tested this and it roughly works.
Your checklist for this pull request
What is the current behaviour?
No python package
What is the new behaviour?
Package installable with
pipis available