test

Dockerfile.admin

@@ -1,18 +1,49 @@
+<<<<<<< HEAD
+FROM python:3.11-slim
+
+RUN apt-get update && apt-get -y install git && apt-get clean
+
+RUN useradd -m app
+=======
+# seccion frontend
+FROM node:20-alpine as frontend
+RUN apk update && apk add git
+>>>>>>> f0b116a (test)
+
+# Copia el proyecto
+RUN git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/admin_transporte_frontend /frontend
+RUN git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/ilab_gestion_backend /backend
+RUN rm -rf /backend/project/dist
+
+# Compilar
+WORKDIR /frontend
+RUN git checkout cc109373b359d20884bf5b258172c40dd0df6d23
+RUN npm install && npm run build
+
+# Contenedor backend
 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/admin_transporte_backend /srv
-
 WORKDIR /srv
 
+<<<<<<< HEAD
 RUN pip install --no-cache-dir -r requirements.txt
 
+=======
+# Actualiza el contenido
+COPY --from=frontend /backend/requirements.txt /srv
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY --from=frontend /backend/readme.md /srv
+COPY --from=frontend /frontend/dist/ /srv/project/dist
+COPY --from=frontend /backend/project/ /srv/project
+
+>>>>>>> f0b116a (test)
 RUN chown -R app:app /srv
 USER app
 
 ENTRYPOINT ["python3"]
-
+CMD [ "/srv/project/manage.py", "runserver", "0.0.0.0:4000" ]
-CMD ["project/manage.py", "runserver", "0.0.0.0:4000"]

Dockerfile.downloads

@@ -18,7 +18,10 @@ RUN chown -R app:app /srv
 
 USER app
 
+<<<<<<< HEAD
 # run the command
+=======
+>>>>>>> f0b116a (test)
 ENTRYPOINT ["gunicorn"]
 
 CMD ["--timeout", "600", "-b", "0.0.0.0:4000", "web:iapp"]

Dockerfile.proto

@@ -1,10 +1,21 @@
 FROM python:3.11-slim
+<<<<<<< HEAD
+
+RUN apt-get update && apt-get -y install git && apt-get clean
+
+RUN useradd -m app
+=======
+>>>>>>> f0b116a (test)
 
 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/proto_backend /srv
+RUN git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/ilab_proto_backend /srv
+
+RUN echo apscheduler >> /srv/requirements.txt
+
+RUN pip install --no-cache-dir -r /srv/requirements.txt
 
 RUN echo apscheduler >> /srv/requirements.txt
 
@@ -15,8 +26,14 @@ COPY fetch.backend_proto.py /srv/fetch.py
 WORKDIR /srv
 
 RUN chown -R app:app /srv
+<<<<<<< HEAD
 USER app
 
+=======
+
+USER app
+
+>>>>>>> f0b116a (test)
 ENTRYPOINT ["python"]
 
 CMD ["fetch.py"]

README.md

@@ -1,2 +1,17 @@
 # Docker_service
 
+Definición del servicio de gestión de transporte publico.
+
+## docker-compose.yaml
+
+Contiene la definición de los contenedores/imagenes que esta compuesto el servicio. Cada contenedor contiene las variables de entorno definidas en forma explicita para el lanzamiento del servicio y en el caso de ser parte del desarrollo referencia a un `Dockerfile` que tiene las intrucciones para la creación del contenedor a partir del codigo.
+
+## Dockerfile's
+
+Cada archivo dockerfile contiene las intrucciones para la creación del contenedor a partir del último commit del repositorio. En el caso que el codigo no se encuentre publico se puede crear un [Personal Access Token](https://gitlab.com/-/user_settings/personal_access_tokens) con permisos de lectura al repositorio usando la sintaxis:
+
+```
+git clone https://personal-access-token-id@git.arpa/url/del/repositorio
+```
+
+Que permite clonar repositorios con una llave dentro del proceso de clonación.

docker-compose.sample.yaml

@@ -1,9 +1,13 @@
+<<<<<<< HEAD
 version: '3'
 
+=======
+>>>>>>> f0b116a (test)
 services:
 
   tdtp-admin:
     build:
+<<<<<<< HEAD
         dockerfile: Dockerfile.adminfull
     image: dev.ilab.cl/tdtp/tdtp_admin:latest
     depends_on:
@@ -19,6 +23,18 @@ services:
       - DBUSER=postgres
       - DBPASS=password
 
+=======
+        dockerfile: Dockerfile.admin
+    image: dev.ilab.cl/tdtp/tdtp_admin:latest
+    ports:
+      - 4000:4000
+    environment:
+      - DBHOST=10.33.193.71
+      - DBNAME=desarrollo10
+      - DBSCHEMA=public
+      - DBUSER=dev_tdtp
+      - DBPASS=POSTGRES_PASSWORD
+>>>>>>> f0b116a (test)
       # Conexion con base datos redis
       - DB_REDIS_HOST=dbredis
       - DB_REDIS_PORT=6379
@@ -29,6 +45,7 @@ services:
       - DB_MONGO_PASS=password
       # Datos de emisor de correos
       - SMTP_HOST=smtp.vpc.ilab.cl
+<<<<<<< HEAD
       - SMTP_PORT=587
       - SMTP_PROTOCOL=tls
       - SMTP_USER=user.auth@mail.tld
@@ -44,6 +61,21 @@ services:
 #      options:
 #        syslog-address: "udp://rsyslog.arpa:514"
 #        tag: "{{.Name}}"
+=======
+      - SMTP_PORT=10025
+      - SMTP_PROTOCOL=plain
+      - SMTP_FROM='"Sistema Transporte" <tdtp@ilab.cl>'
+
+      - PHOTOS_UPLOADS=/srv/profile_pics
+      - GTFS_UPLOADS=/srv/gtfs_data
+      - URL_PARADERO=https://tdt-dev.ilab.cl/paradero/?id=
+      - TIMEOUT=1200
+    volumes:
+      - /srv/lake/transporte/web_static/profile_pics:/srv/profile_pics
+      - /srv/lake/transporte/web_static/gtfs_files:/srv/gtfs_data
+
+
+>>>>>>> f0b116a (test)
   tdtp-cms:
     build:
         dockerfile: Dockerfile.cms
@@ -51,6 +83,7 @@ services:
           - VITE_TRANSPORTE_API=https://gestion.tdt-dev.ilab.cl/api
 #          - VITE_TRANSPORTE_API=http://tdtp-admin:4000/api
           - VITE_TRANSPORTE_USER=11111111-1
+<<<<<<< HEAD
           - VITE_TRANSPORTE_PASS=usuario1
     depends_on:
       - tdtp-admin
@@ -99,6 +132,21 @@ services:
 #      options:
 #        syslog-address: "udp://rsyslog.arpa:514"
 #        tag: "{{.Name}}"
+=======
+          - VITE_TRANSPORTE_PASS=USER_PASSWORD
+    image: dev.ilab.cl/tdtp/tdtp_cms:latest
+    depends_on:
+      - tdtp-admin
+    ports:
+      - 4002:4000
+    environment:
+      - PORT=4000
+      - VITE_TRANSPORTE_API=https://gestion.tdt-dev.ilab.cl/api
+#      - TRANSPORTE_API=http://tdtp-admin:4000/api
+      - VITE_TRANSPORTE_USER=11111111-1
+      - VITE_TRANSPORTE_PASS=USER_PASSWORD
+
+>>>>>>> f0b116a (test)
 
   tdtp-report-generator:
     build:
@@ -110,10 +158,17 @@ services:
       - DEBUG=True
       - SMTP_SERVER=pysmtp.ilab.cl
       - SMTP_PORT=10025
+<<<<<<< HEAD
       - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://postgres:docker@db/test
 #    volumes:
 #      - path/to/gtfsrt_storage:/srv/gtfsrt
 #      - path/to/report_storage:/srv/reportes
+=======
+      - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://dev_tdtp:POSTGRES_PASSWORD@10.33.193.71/desarrollo10
+    volumes:
+      - /srv/lake/transporte/static_dev:/srv/gtfsrt
+      - /srv/lake/transporte/reportes:/srv/reportes
+>>>>>>> f0b116a (test)
 
   tdtp-worker-downloads:
     build:
@@ -123,6 +178,7 @@ services:
       - 4007:4000
     environment:
       - TZ=America/Santiago
+<<<<<<< HEAD
       - DEBUG=True
       - SMTP_SERVER=pysmtp.ilab.cl
       - SMTP_PORT=10025
@@ -154,3 +210,45 @@ services:
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: password
+=======
+      - SMTP_SERVER=pysmtp.ilab.cl
+      - SMTP_PORT=10025
+      - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://dev_tdtp:POSTGRES_PASSWORD@10.33.193.71/desarrollo10
+    volumes:
+      - /srv/lake/transporte/static_dev:/srv/gtfsrt
+      - /srv/lake/transporte/reportes:/srv/reportes
+
+
+  tdtp-proto:
+    build:
+        dockerfile: Dockerfile.proto
+    image: dev.ilab.cl/tdtp/tdtp_proto:latest
+    depends_on:
+      - dbredis
+    environment:
+      - DB_REDIS_HOST=dbredis
+      - DB_REDIS_PORT=6379
+      - INTERVAL=20
+      - BACKEND=http://10.33.193.51:4001/gtfs-rt/api/concepcion
+      - TIMEOUT=1200
+      - TZ=America/Santiago
+
+  dbproto:
+    image: redis:7.2-alpine
+
+  dbmongo:
+    image: mongo:jammy
+    volumes:
+      - /srv/lake/transporte/mongodb/db:/data/db
+      - /srv/lake/transporte/mongodb/configdb:/data/configdb
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: password
+
+
+  # db:
+  #   image: postgis/postgis:14-3.4-alpine
+  #   environment:
+  #     POSTGRES_PASSWORD: POSTGRES_PASSWORD
+  #     POSTGRES_DB: desarrollo10
+>>>>>>> f0b116a (test)