beta1

Dockerfile.paraderos

@@ -1,13 +0,0 @@
-FROM python:3.11-alpine
-RUN apk update
-RUN apk add git
-
-RUN git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/paraderos_backend /srv
-
-WORKDIR /srv
-
-RUN pip install -r requirements.txt
-
-ENTRYPOINT ["python3"]
-
-CMD ["manage.py", "runserver", "0.0.0.0:4000"]

Dockerfile.paraderos_backend

@@ -0,0 +1,32 @@
+FROM python:3.11-slim
+
+RUN apt-get update && apt-get -y install git && apt-get clean
+
+RUN useradd -m app
+
+RUN git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/paraderos_backend /srv
+
+RUN pip install -r /srv/requirements.txt
+
+RUN sed -i -e '/localhost/d' \
+            -e '/hz.kursor.cl/d' \
+            \
+            -e '125i "127.0.0.1:4010"' \
+            -e '125i "paradero.tdt-dev.ilab.cl",' \
+            -e '29i "127.0.0.1:4010"' \
+            -e '29i "paradero.tdt-dev.ilab.cl",' \
+            \
+#            -e '/DEBUG/s/True/False/' \
+#            -e 's/SECRET_KEY.*$/SECRET_KEY="$SECRET_KEY"/g' \
+#            -e 's/USE_TZ.*$/USE_TZ=True/g' \
+           /srv/project/settings.py
+
+RUN chown -R app:app /srv
+
+USER app
+
+WORKDIR /srv
+
+ENTRYPOINT ["python3"]
+
+CMD ["manage.py", "runserver", "0.0.0.0:4000"]

Dockerfile.paraderos_frontend

@@ -0,0 +1,24 @@
+FROM node:18-bullseye-slim
+
+RUN apt-get update && apt-get -y install git && apt-get clean
+
+RUN useradd -m app
+
+RUN git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/paraderos_frontend /srv
+
+WORKDIR /srv
+
+#RUN sed -i -e 's/"build".*$/"build":"vite build",/g' /srv/package.json
+#RUN sed -i -e '9,14d'  /srv/vite.config.js
+
+RUN npm install --legacy-peer-deps
+
+RUN chown -R app:app /srv
+
+USER app
+
+ENV PORT 4000
+
+ENTRYPOINT ["npm"]
+
+CMD ["run", "dev"]

docker-compose.sample.yaml

@@ -10,15 +10,15 @@ services:
       - 4000:4000
     environment:
       - DBHOST=db
-      - DBPORT=5432
+      - DBPORT=4080
       - DBNAME=desarrollo1
       - DBSCHEMA=public
       - DBUSER=postgres
       - DBPASS=password
 
       # Conexion con base datos redis
-      - DB_REDIS_HOST=dbproto
+      - DB_REDIS_HOST=dbredis
-      - DB_REDIS_PORT=6379
+      - DB_REDIS_PORT=4081
 
       # Datos de emisor de correos
       - SMTP_HOST=smtp.server
@@ -32,54 +32,61 @@ services:
 #    logging:
 #      driver: syslog
 #      options:
-#        syslog-address: "udp://rsyslog.vpc.ilab.cl:514"
+#        syslog-address: "udp://rsyslog.arpa:514"
 #        tag: "{{.Name}}"
-  tdtp-paraderos:
+  tdtp-paraderos-backend:
     build:
-        dockerfile: Dockerfile.paraderos
+        dockerfile: Dockerfile.paraderos_backend
-    image: dev.ilab.cl/tdtp/tdtp_paraderos:latest
+    image: dev.ilab.cl/tdtp/tdtp_paraderos_backend:latest
     ports:
-      - 4001:4000
+      - 4010:4000
     environment:
-      - PORT=4000
-      - TRANSPORTE_API=https://transporte.hz.kursor.cl/api
-      - TRANSPORTE_USER=usuario1
-      - TRANSPORTE_PASS=usuario1
-      - DBHOST=db
-      - DBPORT=5432
-      - DBNAME=database
-      - DBSCHEMA=desarrollo1
-      - DBUSER=postgres
-      - DBPASS=password
-
-      - DB_REDIS_HOST=dbproto
-      - DB_REDIS_PORT=6379
-      - SECRET_JWT="kf6Jc!f30Z!1k1N0#!%#"
-
       - TIMEOUT=1200
+      - TRANSPORTE_API=https://host.domain.arpa/api
+      - TRANSPORTE_USER=sampleuser
+      - TRANSPORTE_PASS=samplekey
+      - SECRET_KEY=r1@4)!0x&0^!*r-ulesdw^1wxol#v6tk&0^!*r-ulesdw^miid*b$btx
+
 #    logging:
 #      driver: syslog
 #      options:
-#        syslog-address: "udp://rsyslog.vpc.ilab.cl:514"
+#        syslog-address: "udp://rsyslog.arpa:514"
 #        tag: "{{.Name}}"
 
+  tdtp-paraderos-frontend:
+    build:
+        dockerfile: Dockerfile.paraderos_frontend
+    image: dev.ilab.cl/tdtp/tdtp_paraderos_frontend:latest
+    ports:
+      - 4011:4000
+    environment:
+      - VITE_BACKEND=/rutaParadero
+
+#    logging:
+#      driver: syslog
+#      options:
+#        syslog-address: "udp://rsyslog.arpa:514"
+#        tag: "{{.Name}}"
+
+
+
   tdtp-cms:
     build:
         dockerfile: Dockerfile.cms
     image: dev.ilab.cl/tdtp/tdtp_cms:latest
     ports:
-      - 4002:4000
+      - 4030:4000
     environment:
       - PORT=4000
       - DBHOST=db
-      - DBPORT=5432
+      - DBPORT=4080
       - DBNAME=database
       - DBSCHEMA=desarrollo1
       - DBUSER=postgres
       - DBPASS=password
 
-      - DB_REDIS_HOST=dbproto
+      - DB_REDIS_HOST=dbredis
-      - DB_REDIS_PORT=6379
+      - DB_REDIS_PORT=4081
       - SECRET_JWT="kf6Jc!f30Z!1k1N0#!%#"
 
       - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://dev_feed:testing99901@db01.tdtp.ilab.cl/devrt
@@ -87,7 +94,7 @@ services:
 #    logging:
 #      driver: syslog
 #      options:
-#        syslog-address: "udp://rsyslog.vpc.ilab.cl:514"
+#        syslog-address: "udp://rsyslog.arpa:514"
 #        tag: "{{.Name}}"
 
 
@@ -101,14 +108,14 @@ services:
       - TZ=America/Santiago
       - PORT=4000
       - DBHOST=db
-      - DBPORT=5432
+      - DBPORT=4080
       - DBNAME=database
       - DBSCHEMA=desarrollo1
       - DBUSER=postgres
       - DBPASS=password
 
-      - DB_REDIS_HOST=dbproto
+      - DB_REDIS_HOST=dbredis
-      - DB_REDIS_PORT=6379
+      - DB_REDIS_PORT=4081
       - SECRET_JWT="kf6Jc!f30Z!1k1N0#!%#"
 
       - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://dev_feed:testing99901@db01.tdtp.ilab.cl/devrt
@@ -116,20 +123,30 @@ services:
 #    logging:
 #      driver: syslog
 #      options:
-#        syslog-address: "udp://rsyslog.vpc.ilab.cl:514"
+#        syslog-address: "udp://rsyslog.arpa:514"
 #        tag: "{{.Name}}"
 
-
-  dbproto:
-    image: redis:7.2-alpine
-    ports:
-      - 6379:6379
-
   db:
-#    image: postgis/postgis:14-3.4-alpine
     image: postgres:14-alpine-geometry
+    #    image: postgis/postgis:14-3.4-alpine
     ports:
-      - 5436:5432
+      - 4080:5432
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_DB: database
+
+  dbredis:
+    image: redis:7.2-alpine
+    ports:
+      - 4081:6379
+
+  dbmongo:
+    image: mongo:jammy
+    volumes:
+      - ./monngo/db:/data/db
+      - ./mongo/configdb:/data/configdb
+    ports:
+      - 4082:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: password

docker-compose.yaml

@@ -0,0 +1,30 @@
+version: '3'
+
+services:
+  tdtp-paraderos-backend:
+    build:
+        dockerfile: Dockerfile.paraderos_backend
+    image: dev.ilab.cl/tdtp/tdtp_paraderos_backend:latest
+    ports:
+      - 4010:4000
+    environment:
+      - TIMEOUT=1200
+      - TRANSPORTE_API=https://host.domain.arpa/api
+      - TRANSPORTE_USER=sampleuser
+      - TRANSPORTE_PASS=samplekey
+      - SECRET_KEY=r1@4)!0x&0^!*r-ulesdw^1wxol#v6tk&0^!*r-ulesdw^miid*b$btx
+
+#    logging:
+#      driver: syslog
+#      options:
+#        syslog-address: "udp://rsyslog.arpa:514"
+#        tag: "{{.Name}}"
+
+  tdtp-paraderos-frontend:
+    build:
+        dockerfile: Dockerfile.paraderos_frontend
+    image: dev.ilab.cl/tdtp/tdtp_paraderos_frontend:latest
+    ports:
+      - 4011:4000
+    environment:
+      - VITE_BACKEND=/rutaParadero

oauth_key.txt

@@ -0,0 +1,3 @@
+Tdigital_3
+
+glpat-7rvvq_Qr6x2z5YLqmsrt