From b6b57e34eb7f88451ef51b9ad2a9e893a7325c22 Mon Sep 17 00:00:00 2001
From: Celestino Rey <creylopez@yahoo.es>
Date: Mon, 12 Aug 2024 09:53:36 +0200
Subject: [PATCH] =?UTF-8?q?Funcionando=20para=20mostrar=20la=20versi=C3=B3?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RepostajesPy/K8S/Makefile                     | 4 ++--
 RepostajesPy/K8S/repostajes-deployment.yaml   | 4 ++--
 RepostajesPy/servicios/.env                   | 4 ++--
 RepostajesPy/servicios/Dockerfile             | 1 +
 RepostajesPy/servicios/repostajes/__init__.py | 4 +---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/RepostajesPy/K8S/Makefile b/RepostajesPy/K8S/Makefile
index 39339d7..9fa278b 100644
--- a/RepostajesPy/K8S/Makefile
+++ b/RepostajesPy/K8S/Makefile
@@ -1,5 +1,5 @@
 include  ../servicios/.env
-#export IMG_VERSION = 1.3
+export IMG_VERSION = ${VERSION}
 # limpia todo
 all: imagen clean install
 
@@ -17,4 +17,4 @@ clean:
 	-kubectl delete -f pv-local-repostajes.yaml
 
 prueba:
-	@echo $(IMG_VERSION)
\ No newline at end of file
+	@echo $(VERSION)
diff --git a/RepostajesPy/K8S/repostajes-deployment.yaml b/RepostajesPy/K8S/repostajes-deployment.yaml
index 5063882..8a43546 100644
--- a/RepostajesPy/K8S/repostajes-deployment.yaml
+++ b/RepostajesPy/K8S/repostajes-deployment.yaml
@@ -39,8 +39,8 @@ spec:
         name: repostajespy
         image: registry.reymota.es/repostajes:$IMG_VERSION
         env:
-        - name: SALUDO_DEMO
-          value: "Hola, mundo"
+        - name: VERSION
+          value: "$IMG_VERSION"
         ports:
         - containerPort: 5000
           name: repostajespy
diff --git a/RepostajesPy/servicios/.env b/RepostajesPy/servicios/.env
index 0b1cea9..c5b134d 100644
--- a/RepostajesPy/servicios/.env
+++ b/RepostajesPy/servicios/.env
@@ -1,2 +1,2 @@
-ENVIRONMENT="Desarrollo"
-VERSION=1.4
\ No newline at end of file
+ENVIRONMENT="Producción"
+VERSION=1.4
diff --git a/RepostajesPy/servicios/Dockerfile b/RepostajesPy/servicios/Dockerfile
index 6cb828f..faab300 100644
--- a/RepostajesPy/servicios/Dockerfile
+++ b/RepostajesPy/servicios/Dockerfile
@@ -16,6 +16,7 @@ RUN pip install --upgrade pip
 RUN pip3 install -r requirements.txt
 
 COPY . .
+COPY .env .
 
 # run entrypoint.sh
 ENTRYPOINT ["/repostajes/entrypoint.sh"]
diff --git a/RepostajesPy/servicios/repostajes/__init__.py b/RepostajesPy/servicios/repostajes/__init__.py
index 94d911b..cd3de52 100644
--- a/RepostajesPy/servicios/repostajes/__init__.py
+++ b/RepostajesPy/servicios/repostajes/__init__.py
@@ -56,8 +56,6 @@ def create_app():
     with app.app_context():
         db.create_all()
 
-#    basededatos.init_app(app)
-
     app.register_blueprint(paginas.bp)
     app.register_blueprint(auth.bp)
 
@@ -75,4 +73,4 @@ def muestra_version(valor, clave):
     print("muestra_valor: ", os.getenv(clave))
     return os.getenv(clave, valor)
 
-environment.DEFAULT_FILTERS["muestra_version"] = muestra_version
\ No newline at end of file
+environment.DEFAULT_FILTERS["muestra_version"] = muestra_version