From 3428c16570d8dd4f7b44ee81e4de1f367cc867b2 Mon Sep 17 00:00:00 2001 From: Tristiisch Date: Tue, 27 Aug 2024 02:25:39 +0200 Subject: [PATCH] chore: rename var VERSION to PROJECT_VERSION --- .env.exemple | 2 +- .github/workflows/python.yml | 4 ++-- Dockerfile | 6 +++--- src/pyramid/data/functional/application_info.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.exemple b/.env.exemple index ebd3af5..6a406ab 100644 --- a/.env.exemple +++ b/.env.exemple @@ -10,4 +10,4 @@ SPOTIFY__CLIENT_SECRET= GENERAL__LIMIT_TRACKS=100 MODE=production -VERSION=0.2 +PROJECT_VERSION=0.2 diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index c5bd9b0..4bc37f9 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -204,7 +204,7 @@ jobs: cache-to: type=gha,mode=max provenance: mode=max build-args: | - VERSION=${{ needs.info.outputs.project_version }} + PROJECT_VERSION=${{ needs.info.outputs.project_version }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - name: Export digest @@ -378,7 +378,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max build-args: | - VERSION=${{ needs.info.outputs.project_version }}-tests + PROJECT_VERSION=${{ needs.info.outputs.project_version }}-tests push: false outputs: type=docker diff --git a/Dockerfile b/Dockerfile index ee96123..fb9c322 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Define the Python version and other build arguments ARG PYTHON_VERSION=3.12 -ARG VERSION=0.0.0 +ARG PROJECT_VERSION=0.0.0 ARG APP_USER=app-usr ARG APP_GROUP=app-grp @@ -61,13 +61,13 @@ RUN mkdir -p ./songs && chmod 770 ./songs && chown root:$APP_GROUP ./songs && \ # ============================ Executable Image ============================ FROM base AS executable -ARG VERSION +ARG PROJECT_VERSION ARG APP_USER ARG APP_GROUP LABEL org.opencontainers.image.source="https://github.com/tristiisch/PyRamid" \ org.opencontainers.image.authors="tristiisch" \ - version="$VERSION" + version="$PROJECT_VERSION" # Copy the virtual environment from the builder stage COPY --chown=root:$APP_GROUP --chmod=550 --from=builder /opt/venv /opt/venv diff --git a/src/pyramid/data/functional/application_info.py b/src/pyramid/data/functional/application_info.py index 4323a85..ebdfd85 100644 --- a/src/pyramid/data/functional/application_info.py +++ b/src/pyramid/data/functional/application_info.py @@ -8,7 +8,7 @@ class ApplicationInfo: def __init__(self): self.__name = "pyramid" self.__os = self.__detect_os().lower() - self.__version = os.getenv("VERSION") + self.__version = os.getenv("PROJECT_VERSION") def get_version(self): return f"v{self.__version}"