Cambios para que funcione en openshift con nginx

Dockerfile.oc

@@ -0,0 +1,32 @@
+FROM python:3.11
+
+ENV APP_HOME=/app
+RUN mkdir -p $APP_HOME
+
+WORKDIR $APP_HOME
+
+# install system dependencies
+RUN apt-get update && apt-get install -y nginx sqlite3 netcat-traditional vim curl jq 
+
+COPY ./src/requirements.txt .
+
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir --no-deps -r requirements.txt
+
+# copia fichero de configuración de nginx
+
+COPY ./nginx/nginx.conf /etc/nginx/
+
+# enlace los logs de nginx a stdout
+RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
+
+COPY ./entrypoint.sh .
+
+COPY . $APP_HOME
+
+RUN chmod +x /app/entrypoint.sh
+
+WORKDIR $APP_HOME/src
+
+# run entrypoint.sh
+ENTRYPOINT  ["/app/entrypoint.sh"]

K8S/Makefile.OC

@@ -1,7 +1,7 @@
 export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
 export REGISTRY=registry.reymota.es
 
-export IMG_VERSION = 0.90.20
+export IMG_VERSION = 0.90.21
 
 # limpia todo
 all: ayuda

K8S/env-prod-configmap.yaml

@@ -1,7 +1,15 @@
 apiVersion: v1
 data:
   DEBUG: "False"
+  APP_VERSION: 16.0.1
+  SQL_DATABASE: reymota
+  SQL_ENGINE: django.db.backends.postgresql
+  SQL_HOST: postgresql
+  SQL_PASSWORD: Dsa-0213
+  SQL_PORT: "5432"
+  SQL_USER: creylopez
   DATABASE: postgres
+  MES_COMIENZO_TEMPORADA: "9"
 kind: ConfigMap
 metadata:
   labels:

K8S/jugaralpadel-deployment.yaml

@@ -1,5 +1,18 @@
 apiVersion: v1
 kind: Service
+metadata:
+  name: nginx
+  namespace: jugaralpadel
+spec:
+  ports:
+    - name: "1337"
+      port: 1337
+      targetPort: 80
+  selector:
+    app: jugaralpadel
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: jugaralpadel
   namespace: jugaralpadel
@@ -31,12 +44,7 @@ spec:
         app: jugaralpadel
     spec:
       containers:
-      - args:
-          - gunicorn
-          - gestion_reservas.wsgi:application
-          - --bind
-          - 0.0.0.0:8000
-        name: jugaralpadel
+      - name: jugaralpadel
         image: $REGISTRY/jugaralpadel:$IMG_VERSION
         env:
         - name: IMG_VERSION
@@ -46,6 +54,51 @@ spec:
             configMapKeyRef:
               key: DEBUG
               name: env-prod
+        - name: APP_VERSION
+          valueFrom:
+            configMapKeyRef:
+              key: APP_VERSION
+              name: env-prod
+        - name: MES_COMIENZO_TEMPORADA
+          valueFrom:
+            configMapKeyRef:
+              key: MES_COMIENZO_TEMPORADA
+              name: env-prod
+        - name: DATABASE
+          valueFrom:
+            configMapKeyRef:
+              key: DATABASE
+              name: env-prod
+        - name: SQL_HOST
+          valueFrom:
+            configMapKeyRef:
+              key: SQL_HOST
+              name: env-prod
+        - name: SQL_PORT
+          valueFrom:
+            configMapKeyRef:
+              key: SQL_PORT
+              name: env-prod
+        - name: SQL_ENGINE
+          valueFrom:
+            configMapKeyRef:
+              key: SQL_ENGINE
+              name: env-prod
+        - name: SQL_DATABASE
+          valueFrom:
+            configMapKeyRef:
+              key: SQL_DATABASE
+              name: env-prod
+        - name: SQL_USER
+          valueFrom:
+            configMapKeyRef:
+              key: SQL_USER
+              name: env-prod
+        - name: SQL_PASSWORD
+          valueFrom:
+            configMapKeyRef:
+              key: SQL_PASSWORD
+              name: env-prod
         ports:
         - containerPort: 8000
           protocol: TCP

Makefile

@@ -2,7 +2,7 @@ install:
 
 	echo "Creando imagen con version '${IMG_VERSION}' en el registry '${REGISTRY}'"
 
-	docker build --no-cache -t ${REGISTRY}/jugaralpadel:${IMG_VERSION} -f Dockerfile.k8s .
+	docker build --no-cache -t ${REGISTRY}/jugaralpadel:${IMG_VERSION} -f Dockerfile.oc .
 	docker push ${REGISTRY}/jugaralpadel:${IMG_VERSION}