Browse Source
🐛 Fix Poetry installation in Dockerfile and upgrade Python version and packages to fix Docker build (#480)
Co-authored-by: lidong293 <lidong310@jd.com>
Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>
pull/13907/head
little7Li
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
10 additions and
10 deletions
-
{{cookiecutter.project_slug}}/backend/app/pyproject.toml
-
{{cookiecutter.project_slug}}/backend/backend.dockerfile
-
{{cookiecutter.project_slug}}/backend/celeryworker.dockerfile
|
|
|
@ -5,8 +5,8 @@ description = "" |
|
|
|
authors = ["Admin <admin@example.com>"] |
|
|
|
|
|
|
|
[tool.poetry.dependencies] |
|
|
|
python = "^3.7" |
|
|
|
uvicorn = "^0.11.3" |
|
|
|
python = "^3.8" |
|
|
|
uvicorn = ">=0.24.0.post1" |
|
|
|
fastapi = "^0.54.1" |
|
|
|
python-multipart = "^0.0.5" |
|
|
|
email-validator = "^1.0.5" |
|
|
|
@ -26,8 +26,8 @@ pytest = "^5.4.1" |
|
|
|
python-jose = {extras = ["cryptography"], version = "^3.1.0"} |
|
|
|
|
|
|
|
[tool.poetry.dev-dependencies] |
|
|
|
mypy = "^0.770" |
|
|
|
black = "^19.10b0" |
|
|
|
mypy = ">=1.7.0" |
|
|
|
black = ">=23.11.0" |
|
|
|
isort = "^4.3.21" |
|
|
|
autoflake = "^1.3.1" |
|
|
|
flake8 = "^3.7.9" |
|
|
|
|
|
|
|
@ -1,9 +1,9 @@ |
|
|
|
FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7 |
|
|
|
FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8 |
|
|
|
|
|
|
|
WORKDIR /app/ |
|
|
|
|
|
|
|
# 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 && \ |
|
|
|
ln -s /opt/poetry/bin/poetry && \ |
|
|
|
poetry config virtualenvs.create false |
|
|
|
@ -13,7 +13,7 @@ COPY ./app/pyproject.toml ./app/poetry.lock* /app/ |
|
|
|
|
|
|
|
# Allow installing dev dependencies to run tests |
|
|
|
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 |
|
|
|
# Using inside the container: |
|
|
|
|
|
|
|
@ -1,9 +1,9 @@ |
|
|
|
FROM python:3.7 |
|
|
|
FROM python:3.8 |
|
|
|
|
|
|
|
WORKDIR /app/ |
|
|
|
|
|
|
|
# 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 && \ |
|
|
|
ln -s /opt/poetry/bin/poetry && \ |
|
|
|
poetry config virtualenvs.create false |
|
|
|
@ -13,7 +13,7 @@ COPY ./app/pyproject.toml ./app/poetry.lock* /app/ |
|
|
|
|
|
|
|
# Allow installing dev dependencies to run tests |
|
|
|
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 |
|
|
|
# Using inside the container: |
|
|
|
|
