From 8021489d0f30af19930bb082a7e9159d477acfec Mon Sep 17 00:00:00 2001 From: Dyakov Roman Date: Sat, 15 Apr 2023 14:39:28 +0300 Subject: [PATCH] Update Dockerfile (#5) Co-authored-by: semen603089 --- Dockerfile | 8 +++++--- file_converter/__init__.py | 2 +- file_converter/routes/base.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6a968d..d75c8ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,16 @@ FROM tiangolo/uvicorn-gunicorn-fastapi:python3.11 +ARG APP_VERSION=dev +ENV APP_VERSION=${APP_VERSION} ENV APP_NAME=file_converter ENV APP_MODULE=${APP_NAME}.routes.base:app COPY ./requirements.txt /app/ -RUN pip install -U -r /app/requirements.txt - -COPY ./static /app/static/ COPY ./logging_prod.conf /app/ COPY ./logging_test.conf /app/ +RUN pip install -U -r /app/requirements.txt + +COPY ./static /app/static/ COPY ./${APP_NAME} /app/${APP_NAME} RUN apt-get update && \ diff --git a/file_converter/__init__.py b/file_converter/__init__.py index 10b3477..fa9c098 100644 --- a/file_converter/__init__.py +++ b/file_converter/__init__.py @@ -1,4 +1,4 @@ import os -__version__ = os.getenv('APP_VERSION', 'dev') \ No newline at end of file +__version__ = os.getenv('APP_VERSION', 'dev') diff --git a/file_converter/routes/base.py b/file_converter/routes/base.py index e6a08c8..f7a8151 100644 --- a/file_converter/routes/base.py +++ b/file_converter/routes/base.py @@ -5,10 +5,10 @@ from fastapi.staticfiles import StaticFiles from httpx import Response from starlette import status -from file_converter import __version__ from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint from starlette.types import ASGIApp +from file_converter import __version__ from file_converter.routes.file import router as converter_router from ..settings import Settings