Merge remote-tracking branch 'origin/main' into hub1-barre-v030
# Conflicts: # app/config.py
This commit is contained in:
@@ -10,6 +10,7 @@ ENV PYTHONUNBUFFERED=1 \
|
|||||||
# first, copy app/ afterwards) the installed distribution was empty and
|
# first, copy app/ afterwards) the installed distribution was empty and
|
||||||
# the app only worked by accident of the working directory.
|
# the app only worked by accident of the working directory.
|
||||||
COPY pyproject.toml ./
|
COPY pyproject.toml ./
|
||||||
|
COPY VERSION ./VERSION
|
||||||
COPY app/ ./app/
|
COPY app/ ./app/
|
||||||
COPY static/ ./static/
|
COPY static/ ./static/
|
||||||
RUN pip install --no-cache-dir .
|
RUN pip install --no-cache-dir .
|
||||||
|
|||||||
+2
-1
@@ -181,7 +181,8 @@ from urllib.parse import urlparse
|
|||||||
|
|
||||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
APP_VERSION = "0.45.9"
|
_version_file = next((Path(p) for p in ("/VERSION", BASE_DIR / "VERSION") if Path(p).exists()), None)
|
||||||
|
APP_VERSION = _version_file.read_text().strip() if _version_file else "inconnue"
|
||||||
|
|
||||||
|
|
||||||
def _env_bool(name: str, default: bool) -> bool:
|
def _env_bool(name: str, default: bool) -> bool:
|
||||||
|
|||||||
Reference in New Issue
Block a user