Merge branch 'main' of http://reymota.ddns.net:30009/creylopez/AppsPy

LibrosPy/K8S/Makefile

@@ -1,4 +1,4 @@
-export IMG_VERSION = 1.0
+export IMG_VERSION = 1.1
 # limpia todo
 all: imagen clean install
 
@@ -6,11 +6,11 @@ imagen:
 	cd ../servicios; make
 
 install:
-	envsubst < libros-deployment.yaml |kubectl create -f -
-	kubectl create -f pv-local-libros.yaml
-	kubectl create -f libros-prod-persistentvolumeclaim.yaml
+	-envsubst < libros-deployment.yaml |kubectl create -f -
+	-kubectl create -f pv-local-libros.yaml
+	-kubectl create -f libros-prod-persistentvolumeclaim.yaml
 
 clean:
-	envsubst < libros-deployment.yaml |kubectl delete -f -
-	kubectl delete -f libros-prod-persistentvolumeclaim.yaml
-	kubectl delete -f pv-local-libros.yaml
+	-envsubst < libros-deployment.yaml |kubectl delete -f -
+	-kubectl delete -f libros-prod-persistentvolumeclaim.yaml
+	-kubectl delete -f pv-local-libros.yaml

LibrosPy/K8S/libros-deployment.yaml

@@ -37,7 +37,7 @@ spec:
           - 0.0.0.0:5000
           - libros:create_app()
         name: librospy
-        image: creylopez/libros:$IMG_VERSION
+        image: registry.reymota.es/libros:$IMG_VERSION
         env:
         - name: SALUDO_DEMO
           value: "Hola, mundo"
@@ -50,6 +50,8 @@ spec:
           name: librospy-instance
         - mountPath: /libros/migrations
           name: librospy-migrations
+      imagePullSecrets:
+      - name: myregistrykey
       restartPolicy: Always
       volumes:
       - name: librospy-instance

LibrosPy/servicios/Makefile

@@ -2,7 +2,5 @@ install:
 
 	echo "Creando imagen con version ${IMG_VERSION}"
 
-	docker build --no-cache -t creylopez/libros:${IMG_VERSION} .
-	docker push creylopez/libros:${IMG_VERSION}
-
-
+	docker build --no-cache -t registry.reymota.es/libros:${IMG_VERSION} .
+	docker push registry.reymota.es/libros:${IMG_VERSION}

LyricsPy/K8S/Makefile

@@ -6,8 +6,11 @@ imagen:
 	cd ../servicios; make
 
 install:
-	envsubst < lyrics-deployment.yaml |kubectl create -f -
+	-kubectl create -f pv-local-lyrics.yaml
+	-kubectl create -f lyrics-prod-persistentvolumeclaim.yaml
+	-envsubst < lyrics-deployment.yaml |kubectl create -f -
 
 clean:
-	envsubst < lyrics-deployment.yaml |kubectl delete -f -
-
+	-envsubst < lyrics-deployment.yaml |kubectl delete -f -
+	-kubectl delete -f lyrics-prod-persistentvolumeclaim.yaml
+	-kubectl delete -f pv-local-lyrics.yaml

LyricsPy/K8S/lyrics-deployment.yaml

@@ -36,7 +36,7 @@ spec:
           - --bind
           - 0.0.0.0:5000
           - lyrics:create_app()
-        image: creylopez/lyrics:$IMG_VERSION
+        image: registry.reymota.es/lyrics:$IMG_VERSION
         name: lyrics
         ports:
         - containerPort: 5000
@@ -45,6 +45,8 @@ spec:
         volumeMounts:
         - mountPath: /lyrics/instance
           name: lyrics-prod
+      imagePullSecrets:
+      - name: myregistrykey
       restartPolicy: Always
       volumes:
       - name: lyrics-prod

LyricsPy/servicios/Makefile

@@ -2,7 +2,7 @@ install:
 
 	echo "Creando imagen con version ${IMG_VERSION}"
 
-	docker build --no-cache -t creylopez/lyrics:${IMG_VERSION} .
-	docker push creylopez/lyrics:${IMG_VERSION}
+	docker build --no-cache -t registry.reymota.es/lyrics:${IMG_VERSION} .
+	docker push registry.reymota.es/lyrics:${IMG_VERSION}
 
 

RepostajesPy/K8S/Makefile

@@ -6,11 +6,11 @@ imagen:
 	cd ../servicios; make
 
 install:
-	envsubst < repostajes-deployment.yaml |kubectl create -f -
-	kubectl create -f pv-local-repostajes.yaml
-	kubectl create -f repostajes-prod-persistentvolumeclaim.yaml
+	-kubectl create -f pv-local-repostajes.yaml
+	-kubectl create -f repostajes-prod-persistentvolumeclaim.yaml
+	-envsubst < repostajes-deployment.yaml |kubectl create -f -
 
 clean:
-	envsubst < repostajes-deployment.yaml |kubectl delete -f -
-	kubectl delete -f repostajes-prod-persistentvolumeclaim.yaml
-	kubectl delete -f pv-local-repostajes.yaml
+	-envsubst < repostajes-deployment.yaml |kubectl delete -f -
+	-kubectl delete -f repostajes-prod-persistentvolumeclaim.yaml
+	-kubectl delete -f pv-local-repostajes.yaml

RepostajesPy/K8S/repostajes-deployment.yaml

@@ -37,7 +37,7 @@ spec:
           - 0.0.0.0:5000
           - repostajes:create_app()
         name: repostajespy
-        image: creylopez/repostajes:$IMG_VERSION
+        image: registry.reymota.es/repostajes:$IMG_VERSION
         env:
         - name: SALUDO_DEMO
           value: "Hola, mundo"
@@ -50,6 +50,8 @@ spec:
           name: repostajespy-instance
         - mountPath: /repostajes/migrations
           name: repostajespy-migrations
+      imagePullSecrets:
+      - name: myregistrykey
       restartPolicy: Always
       volumes:
       - name: repostajespy-instance

RepostajesPy/servicios/Makefile

@@ -2,7 +2,7 @@ install:
 
 	echo "Creando imagen con version ${IMG_VERSION}"
 
-	docker build --no-cache -t creylopez/repostajes:${IMG_VERSION} .
-	docker push creylopez/repostajes:${IMG_VERSION}
+	docker build --no-cache -t registry.reymota.es/repostajes:${IMG_VERSION} .
+	docker push registry.reymota.es/repostajes:${IMG_VERSION}