diff --git a/K8S/Makefile b/K8S/Makefile index d3972dc..785b7a2 100644 --- a/K8S/Makefile +++ b/K8S/Makefile @@ -1,7 +1,8 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.69 +export IMG_VERSION = 0.70 export IMG_NGINX_VERSION = 1.0 +export APP_VERSION = 12.0 # limpia todo all: imagen clean install diff --git a/K8S/reymota-deployment.yaml b/K8S/reymota-deployment.yaml index 971a297..b9994bc 100644 --- a/K8S/reymota-deployment.yaml +++ b/K8S/reymota-deployment.yaml @@ -39,8 +39,8 @@ spec: name: reymota image: $REGISTRY/reymota-$ARQUITECTURA:$IMG_VERSION env: - - name: VERSION - value: "$IMG_VERSION" + - name: APP_VERSION + value: "$APP_VERSION" - name: OPENSHIFT value: "False" - name: ENVIRONMENT diff --git a/README.md b/README.md index 5afbf15..e789334 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Crear un proyecto. A continuación añadir una app desde Agregar, importar desde git. - oc new-app http://gitea.reymota.es/creylopez/ReyMotaAppsOC.git -e DEBUG="False" -e OPENSHIFT="True" --name='reymota' + oc new-app http://gitea.reymota.es/creylopez/ReyMotaAppsOC.git -e APP_VERSION="12.0.0" -e DEBUG="False" -e OPENSHIFT="True" --name='reymota' Tal y como está la estructura de directorios, deberia detectar automáticamente una compilación Python diff --git a/src/reymota/settings.py b/src/reymota/settings.py index 1ff6170..206d0a1 100644 --- a/src/reymota/settings.py +++ b/src/reymota/settings.py @@ -14,7 +14,8 @@ from pathlib import Path import os import logging -APP_VERSION = "11.0.2" +# APP_VERSION = "11.0.2" +APP_VERSION = os.environ.get("APP_VERSION", "0.0.0-dev") # Valor por defecto si no está definido # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent