diff --git a/JugarAlPadel/Dockerfile b/JugarAlPadel/Dockerfile index ff3a425..c6181c6 100644 --- a/JugarAlPadel/Dockerfile +++ b/JugarAlPadel/Dockerfile @@ -67,7 +67,7 @@ COPY . $APP_HOME # change to the app user #USER app -WORKDIR $APP_HOME/reymota +WORKDIR $APP_HOME/gestion_reservas # run entrypoint.sh ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/JugarAlPadel/K8S/Makefile b/JugarAlPadel/K8S/Makefile index 5b6e690..31de7ac 100644 --- a/JugarAlPadel/K8S/Makefile +++ b/JugarAlPadel/K8S/Makefile @@ -1,8 +1,8 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') #export REGISTRY=registry.cube.local export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.01 -export IMG_NGINX_VERSION = 1.0 +export IMG_VERSION = 0.03 +export IMG_NGINX_VERSION = 2.0 # limpia todo all: imagen clean install diff --git a/JugarAlPadel/K8S/env-prod-configmap.yaml b/JugarAlPadel/K8S/env-prod-configmap.yaml index 0da623e..0ab98e6 100644 --- a/JugarAlPadel/K8S/env-prod-configmap.yaml +++ b/JugarAlPadel/K8S/env-prod-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - DEBUG: "False" + DEBUG: "True" DJANGO_ALLOWED_HOSTS: "reymota.es k8s-server localhost 127.0.0.1 [::1]" CSRF_TRUSTED_ORIGINS: "https://reymota.es" SECRET_KEY: change_me diff --git a/JugarAlPadel/K8S/jugaralpadel-deployment.yaml b/JugarAlPadel/K8S/jugaralpadel-deployment.yaml index 4d6cabd..bcedc6f 100644 --- a/JugarAlPadel/K8S/jugaralpadel-deployment.yaml +++ b/JugarAlPadel/K8S/jugaralpadel-deployment.yaml @@ -105,14 +105,10 @@ spec: - mountPath: /app/jugaralpadel/mediafiles name: jugaralpadel-media - - mountPath: /app/jugaralpadel/lyrics/migrations - name: jugaralpadel-lyrics-migrations - - mountPath: /app/jugaralpadel/repostajes/migrations - name: jugaralpadel-repostajes-migrations - - mountPath: /app/jugaralpadel/libros/migrations - name: jugaralpadel-libros-migrations - - mountPath: /app/jugaralpadel/jugaralpadelusers/migrations - name: jugaralpadel-jugaralpadelusers-migrations + - mountPath: /app/jugaralpadel/eventos/migrations + name: jugaralpadel-eventos-migrations + - mountPath: /app/jugaralpadel/reymotausers/migrations + name: jugaralpadel-reymotausers-migrations - mountPath: /app/jugaralpadel/staticfiles name: static-volume @@ -123,18 +119,12 @@ spec: - name: jugaralpadel-media persistentVolumeClaim: claimName: jugaralpadel-media - - name: jugaralpadel-lyrics-migrations + - name: jugaralpadel-eventos-migrations persistentVolumeClaim: - claimName: jugaralpadel-lyrics-migrations - - name: jugaralpadel-repostajes-migrations + claimName: jugaralpadel-eventos-migrations + - name: jugaralpadel-reymotausers-migrations persistentVolumeClaim: - claimName: jugaralpadel-repostajes-migrations - - name: jugaralpadel-libros-migrations - persistentVolumeClaim: - claimName: jugaralpadel-libros-migrations - - name: jugaralpadel-jugaralpadelusers-migrations - persistentVolumeClaim: - claimName: jugaralpadel-jugaralpadelusers-migrations + claimName: jugaralpadel-reymotausers-migrations - name: static-volume persistentVolumeClaim: claimName: static-volume diff --git a/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml b/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml index c3b19d2..d8c2c1a 100644 --- a/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml +++ b/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml @@ -19,24 +19,8 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: jugaralpadel-libros-migrations - name: jugaralpadel-libros-migrations - namespace: jugaralpadel -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 51Mi -status: {} ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - creationTimestamp: null - labels: - io.kompose.service: jugaralpadel-lyrics-migrations - name: jugaralpadel-lyrics-migrations + io.kompose.service: jugaralpadel-eventos-migrations + name: jugaralpadel-eventos-migrations namespace: jugaralpadel spec: accessModes: @@ -51,24 +35,8 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: jugaralpadel-repostajes-migrations - name: jugaralpadel-repostajes-migrations - namespace: jugaralpadel -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 52Mi -status: {} ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - creationTimestamp: null - labels: - io.kompose.service: jugaralpadel-jugaralpadelusers-migrations - name: jugaralpadel-jugaralpadelusers-migrations + io.kompose.service: jugaralpadel-reymotausers-migrations + name: jugaralpadel-reymotausers-migrations namespace: jugaralpadel spec: accessModes: diff --git a/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml b/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml index 7a25c6c..5b4aa9d 100644 --- a/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml +++ b/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml @@ -16,7 +16,7 @@ spec: apiVersion: v1 kind: PersistentVolume metadata: - name: jugaralpadel-lyrics-migrations-folder + name: jugaralpadel-eventos-migrations-folder namespace: jugaralpadel labels: app: jugaralpadel @@ -31,7 +31,7 @@ spec: apiVersion: v1 kind: PersistentVolume metadata: - name: jugaralpadel-jugaralpadelusers-migrations-folder + name: jugaralpadel-reymotausers-migrations-folder namespace: jugaralpadel labels: app: jugaralpadel diff --git a/JugarAlPadel/Makefile b/JugarAlPadel/Makefile index 73c0a45..41e19a2 100644 --- a/JugarAlPadel/Makefile +++ b/JugarAlPadel/Makefile @@ -2,7 +2,7 @@ install: echo "Creando imagen con version '${IMG_VERSION}' para la arquitectura '${ARQUITECTURA}' en el registry '${REGISTRY}'" - docker build --no-cache -t ${REGISTRY}/reymota-${ARQUITECTURA}:${IMG_VERSION} . - docker push ${REGISTRY}/reymota-${ARQUITECTURA}:${IMG_VERSION} + docker build --no-cache -t ${REGISTRY}/jugaralpadel-${ARQUITECTURA}:${IMG_VERSION} . + docker push ${REGISTRY}/jugaralpadel-${ARQUITECTURA}:${IMG_VERSION} diff --git a/JugarAlPadel/gestion_reservas/db.sqlite3 b/JugarAlPadel/gestion_reservas/db.sqlite3 deleted file mode 100644 index 35775c1..0000000 Binary files a/JugarAlPadel/gestion_reservas/db.sqlite3 and /dev/null differ diff --git a/JugarAlPadel/nginx/Makefile b/JugarAlPadel/nginx/Makefile index fb1a26d..90cbef6 100644 --- a/JugarAlPadel/nginx/Makefile +++ b/JugarAlPadel/nginx/Makefile @@ -2,7 +2,7 @@ install: echo "Creando imagen con version '${IMG_NGINX_VERSION}' para la arquitectura '${ARQUITECTURA}' en el registry '${REGISTRY}'" - docker build --no-cache -t ${REGISTRY}/nginx-reymota-${ARQUITECTURA}:${IMG_NGINX_VERSION} . - docker push ${REGISTRY}/nginx-reymota-${ARQUITECTURA}:${IMG_NGINX_VERSION} + docker build --no-cache -t ${REGISTRY}/nginx-jugaralpadel-${ARQUITECTURA}:${IMG_NGINX_VERSION} . + docker push ${REGISTRY}/nginx-jugaralpadel-${ARQUITECTURA}:${IMG_NGINX_VERSION} diff --git a/JugarAlPadel/nginx/nginx.conf b/JugarAlPadel/nginx/nginx.conf index 5316ea0..b3440ce 100644 --- a/JugarAlPadel/nginx/nginx.conf +++ b/JugarAlPadel/nginx/nginx.conf @@ -1,5 +1,5 @@ upstream reymota { - server reymota:8000; + server jugaralpadel:8000; } server { @@ -7,7 +7,7 @@ server { listen 80; location / { - proxy_pass http://reymota; + proxy_pass http://jugaralpadel; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; @@ -15,11 +15,11 @@ server { } location /static/ { - alias /app/reymota/staticfiles/; + alias /app/gestion_reservas/staticfiles/; } location /media/ { - alias /app/reymota/mediafiles/; + alias /app/gestion_reservas/mediafiles/; } }