alessandro trinca tornidor
commited on
Commit
·
c0a740e
1
Parent(s):
14e4908
ci: fix many small problems caused by the docker build process, added .dockerignore; bump to project version 0.5.1
Browse files- .dockerignore +24 -0
- Dockerfile +1 -1
- README.md +0 -2
- docker-compose.yaml +1 -1
- dockerfiles/dockerfile_my_ghost_writer_base +3 -2
- pyproject.toml +4 -1
.dockerignore
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
venv/
|
| 2 |
+
*.pyc
|
| 3 |
+
__cache__
|
| 4 |
+
.idea
|
| 5 |
+
tmp/
|
| 6 |
+
.env*
|
| 7 |
+
__pycache__
|
| 8 |
+
.DS_Store
|
| 9 |
+
.pytest_cache
|
| 10 |
+
node_modules
|
| 11 |
+
dist
|
| 12 |
+
*/node_modules
|
| 13 |
+
*/dist
|
| 14 |
+
*/.env*
|
| 15 |
+
.coverage
|
| 16 |
+
.git/
|
| 17 |
+
*/.git/
|
| 18 |
+
*/.git*
|
| 19 |
+
mongo/
|
| 20 |
+
.history/
|
| 21 |
+
.continue/
|
| 22 |
+
.vscode/
|
| 23 |
+
scripts/
|
| 24 |
+
tests/
|
Dockerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
FROM registry.gitlab.com/aletrn/my_ghost_writer_base:0.5.
|
| 2 |
|
| 3 |
LABEL authors="trincadev"
|
| 4 |
|
|
|
|
| 1 |
+
FROM registry.gitlab.com/aletrn/my_ghost_writer_base:0.5.1
|
| 2 |
|
| 3 |
LABEL authors="trincadev"
|
| 4 |
|
README.md
CHANGED
|
@@ -115,8 +115,6 @@ To source more than one env variable, you can use this command:
|
|
| 115 |
set -o allexport && source <(cat ./.env) && set +o allexport;
|
| 116 |
```
|
| 117 |
|
| 118 |
-
Instead to simple
|
| 119 |
-
|
| 120 |
## Contributing
|
| 121 |
|
| 122 |
Pull requests are welcome! Please make sure to test your changes thoroughly before submitting a pull request.
|
|
|
|
| 115 |
set -o allexport && source <(cat ./.env) && set +o allexport;
|
| 116 |
```
|
| 117 |
|
|
|
|
|
|
|
| 118 |
## Contributing
|
| 119 |
|
| 120 |
Pull requests are welcome! Please make sure to test your changes thoroughly before submitting a pull request.
|
docker-compose.yaml
CHANGED
|
@@ -6,7 +6,7 @@ services:
|
|
| 6 |
build:
|
| 7 |
context: .
|
| 8 |
tags:
|
| 9 |
-
- registry.gitlab.com/aletrn/my_ghost_writer:0.
|
| 10 |
ports:
|
| 11 |
- "7860:7860"
|
| 12 |
environment:
|
|
|
|
| 6 |
build:
|
| 7 |
context: .
|
| 8 |
tags:
|
| 9 |
+
- registry.gitlab.com/aletrn/my_ghost_writer:0.5.1
|
| 10 |
ports:
|
| 11 |
- "7860:7860"
|
| 12 |
environment:
|
dockerfiles/dockerfile_my_ghost_writer_base
CHANGED
|
@@ -37,7 +37,6 @@ RUN groupadd -g 999 python && useradd -r -u 999 -g python python
|
|
| 37 |
RUN mkdir ${WORKDIR_ROOT} && chown python:python ${WORKDIR_ROOT}
|
| 38 |
WORKDIR ${WORKDIR_ROOT}
|
| 39 |
COPY --chown=python:python requirements_poetry.txt pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}/
|
| 40 |
-
COPY --chown=python:python ../my_ghost_writer ${WORKDIR_ROOT}/my_ghost_writer
|
| 41 |
|
| 42 |
# poetry installation path is NOT within ${WORKDIR_ROOT}: not needed for runtime docker image
|
| 43 |
RUN python -m pip install -r ${WORKDIR_ROOT}/requirements_poetry.txt
|
|
@@ -70,7 +69,8 @@ RUN . ${WORKDIR_ROOT}/.venv && which python && pip list
|
|
| 70 |
|
| 71 |
COPY --chown=python:python ./lite.koboldai.net ${WORKDIR_ROOT}/lite.koboldai.net
|
| 72 |
COPY --chown=python:python ./my_ghost_writer ${WORKDIR_ROOT}/my_ghost_writer
|
| 73 |
-
|
|
|
|
| 74 |
|
| 75 |
RUN echo "new WORKDIR_ROOT after hidden venv copy => ${WORKDIR_ROOT}"
|
| 76 |
RUN ls -ld ${WORKDIR_ROOT}/
|
|
@@ -78,3 +78,4 @@ RUN ls -lA ${WORKDIR_ROOT}/
|
|
| 78 |
RUN ls -l ${WORKDIR_ROOT}/lite.koboldai.net/index.html
|
| 79 |
RUN ls -l ${WORKDIR_ROOT}/static/index.html
|
| 80 |
RUN ls -l ${WORKDIR_ROOT}/my_ghost_writer/app.py
|
|
|
|
|
|
| 37 |
RUN mkdir ${WORKDIR_ROOT} && chown python:python ${WORKDIR_ROOT}
|
| 38 |
WORKDIR ${WORKDIR_ROOT}
|
| 39 |
COPY --chown=python:python requirements_poetry.txt pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}/
|
|
|
|
| 40 |
|
| 41 |
# poetry installation path is NOT within ${WORKDIR_ROOT}: not needed for runtime docker image
|
| 42 |
RUN python -m pip install -r ${WORKDIR_ROOT}/requirements_poetry.txt
|
|
|
|
| 69 |
|
| 70 |
COPY --chown=python:python ./lite.koboldai.net ${WORKDIR_ROOT}/lite.koboldai.net
|
| 71 |
COPY --chown=python:python ./my_ghost_writer ${WORKDIR_ROOT}/my_ghost_writer
|
| 72 |
+
RUN mkdir ${WORKDIR_ROOT}/static && chown python:python ${WORKDIR_ROOT}/static
|
| 73 |
+
COPY static/index-dark.css static/index.html static/index_dark.html static/index.css static/index.js ${WORKDIR_ROOT}/static/
|
| 74 |
|
| 75 |
RUN echo "new WORKDIR_ROOT after hidden venv copy => ${WORKDIR_ROOT}"
|
| 76 |
RUN ls -ld ${WORKDIR_ROOT}/
|
|
|
|
| 78 |
RUN ls -l ${WORKDIR_ROOT}/lite.koboldai.net/index.html
|
| 79 |
RUN ls -l ${WORKDIR_ROOT}/static/index.html
|
| 80 |
RUN ls -l ${WORKDIR_ROOT}/my_ghost_writer/app.py
|
| 81 |
+
RUN ls -l ${WORKDIR_ROOT}/my_ghost_writer/custom_synonym_handler.py
|
pyproject.toml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
[project]
|
| 2 |
name = "my-ghost-writer"
|
| 3 |
-
version = "0.5.
|
| 4 |
description = "A simple webapp supporting writers"
|
| 5 |
authors = [
|
| 6 |
{name = "alessandro trinca tornidor",email = "[email protected]"}
|
|
@@ -18,6 +18,9 @@ dependencies = [
|
|
| 18 |
"pyinflect (>=0.5.1,<0.6.0)"
|
| 19 |
]
|
| 20 |
|
|
|
|
|
|
|
|
|
|
| 21 |
[tool.poetry.group.test]
|
| 22 |
optional = true
|
| 23 |
|
|
|
|
| 1 |
[project]
|
| 2 |
name = "my-ghost-writer"
|
| 3 |
+
version = "0.5.1"
|
| 4 |
description = "A simple webapp supporting writers"
|
| 5 |
authors = [
|
| 6 |
{name = "alessandro trinca tornidor",email = "[email protected]"}
|
|
|
|
| 18 |
"pyinflect (>=0.5.1,<0.6.0)"
|
| 19 |
]
|
| 20 |
|
| 21 |
+
[tool.poetry]
|
| 22 |
+
package-mode = false
|
| 23 |
+
|
| 24 |
[tool.poetry.group.test]
|
| 25 |
optional = true
|
| 26 |
|