nt_web_template/full-stack-fastapi-template
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

🐛 Fix Poetry installation in Dockerfile and upgrade Python version and packages to fix Docker build (#480)

Browse Source 
Co-authored-by: lidong293 <lidong310@jd.com>
Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>
This commit is contained in:
little7Li
2023-11-15 04:14:19 +08:00
committed by GitHub
parent 6c9f70281b
commit f3823edaed
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
{{cookiecutter.project_slug}}/backend/app/pyproject.toml
View File

@@ -5,8 +5,8 @@ description = ""
authors = ["Admin <admin@example.com>"] authors = ["Admin <admin@example.com>"]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.7" python = "^3.8"
uvicorn = "^0.11.3" uvicorn = ">=0.24.0.post1"
fastapi = "^0.54.1" fastapi = "^0.54.1"
python-multipart = "^0.0.5" python-multipart = "^0.0.5"
email-validator = "^1.0.5" email-validator = "^1.0.5"
@@ -26,8 +26,8 @@ pytest = "^5.4.1"
python-jose = {extras = ["cryptography"], version = "^3.1.0"} python-jose = {extras = ["cryptography"], version = "^3.1.0"}
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
mypy = "^0.770" mypy = ">=1.7.0"
black = "^19.10b0" black = ">=23.11.0"
isort = "^4.3.21" isort = "^4.3.21"
autoflake = "^1.3.1" autoflake = "^1.3.1"
flake8 = "^3.7.9" flake8 = "^3.7.9"

6
{{cookiecutter.project_slug}}/backend/backend.dockerfile
View File

@@ -1,9 +1,9 @@
FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7 FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8
WORKDIR /app/ WORKDIR /app/
# Install Poetry # Install Poetry
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python && \
cd /usr/local/bin && \ cd /usr/local/bin && \
ln -s /opt/poetry/bin/poetry && \ ln -s /opt/poetry/bin/poetry && \
poetry config virtualenvs.create false poetry config virtualenvs.create false
@@ -13,7 +13,7 @@ COPY ./app/pyproject.toml ./app/poetry.lock* /app/
# Allow installing dev dependencies to run tests # Allow installing dev dependencies to run tests
ARG INSTALL_DEV=false ARG INSTALL_DEV=false
RUN bash -c "if [ $INSTALL_DEV == 'true' ] ; then poetry install --no-root ; else poetry install --no-root --no-dev ; fi" RUN bash -c "if [ $INSTALL_DEV == 'true' ] ; then poetry install --no-root ; else poetry install --no-root --only main ; fi"
# For development, Jupyter remote kernel, Hydrogen # For development, Jupyter remote kernel, Hydrogen
# Using inside the container: # Using inside the container:

6
{{cookiecutter.project_slug}}/backend/celeryworker.dockerfile
View File

@@ -1,9 +1,9 @@
FROM python:3.7 FROM python:3.8
WORKDIR /app/ WORKDIR /app/
# Install Poetry # Install Poetry
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python && \
cd /usr/local/bin && \ cd /usr/local/bin && \
ln -s /opt/poetry/bin/poetry && \ ln -s /opt/poetry/bin/poetry && \
poetry config virtualenvs.create false poetry config virtualenvs.create false
@@ -13,7 +13,7 @@ COPY ./app/pyproject.toml ./app/poetry.lock* /app/
# Allow installing dev dependencies to run tests # Allow installing dev dependencies to run tests
ARG INSTALL_DEV=false ARG INSTALL_DEV=false
RUN bash -c "if [ $INSTALL_DEV == 'true' ] ; then poetry install --no-root ; else poetry install --no-root --no-dev ; fi" RUN bash -c "if [ $INSTALL_DEV == 'true' ] ; then poetry install --no-root ; else poetry install --no-root --only main ; fi"
# For development, Jupyter remote kernel, Hydrogen # For development, Jupyter remote kernel, Hydrogen
# Using inside the container: # Using inside the container: