From e06983bbd93d380afdbadecfcc911ec91626cc0b Mon Sep 17 00:00:00 2001 From: Israel Figueroa Date: Mon, 29 Jul 2024 18:45:58 -0400 Subject: [PATCH] test --- .gitignore | 3 + docker-compose.sample.yaml | 133 +------------------------------------ 2 files changed, 4 insertions(+), 132 deletions(-) diff --git a/.gitignore b/.gitignore index 35f78b1..4c9933b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ docker-compose.yaml +*py +*txt +*paraderos* diff --git a/docker-compose.sample.yaml b/docker-compose.sample.yaml index b010708..46f9c42 100644 --- a/docker-compose.sample.yaml +++ b/docker-compose.sample.yaml @@ -1,29 +1,7 @@ -<<<<<<< HEAD -version: '3' - -======= ->>>>>>> f0b116a (test) services: tdtp-admin: build: -<<<<<<< HEAD - dockerfile: Dockerfile.adminfull - image: dev.ilab.cl/tdtp/tdtp_admin:latest - depends_on: - - dbredis - - dbmongo - ports: - - 4000:4000 - environment: - - DBHOST=db - - DBPORT=4080 - - DBNAME=desarrollo1 - - DBSCHEMA=public - - DBUSER=postgres - - DBPASS=password - -======= dockerfile: Dockerfile.admin image: dev.ilab.cl/tdtp/tdtp_admin:latest ports: @@ -34,7 +12,7 @@ services: - DBSCHEMA=public - DBUSER=dev_tdtp - DBPASS=POSTGRES_PASSWORD ->>>>>>> f0b116a (test) + # Conexion con base datos redis - DB_REDIS_HOST=dbredis - DB_REDIS_PORT=6379 @@ -45,23 +23,6 @@ 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 - - SMTP_PASS=saasñldañkadsñ - - SMTP_FROM='"Sistema Transporte" ' - - #COORDENADAS DE INICIO PARA EL MAPA - - COORDINI_LAT=-36.8270 - - COORDINI_LNG=-73.0503 - - TIMEOUT=1200 -# logging: -# driver: syslog -# options: -# syslog-address: "udp://rsyslog.arpa:514" -# tag: "{{.Name}}" -======= - SMTP_PORT=10025 - SMTP_PROTOCOL=plain - SMTP_FROM='"Sistema Transporte" ' @@ -75,7 +36,6 @@ services: - /srv/lake/transporte/web_static/gtfs_files:/srv/gtfs_data ->>>>>>> f0b116a (test) tdtp-cms: build: dockerfile: Dockerfile.cms @@ -83,56 +43,6 @@ 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 - image: dev.ilab.cl/tdtp/tdtp_cms:latest - ports: - - 4002:4000 - args: - - PORT=4000 - - VITE_TRANSPORTE_API=https://gestion.tdt-dev.ilab.cl/api - - VITE_TRANSPORTE_USER=11111111-1 - - VITE_TRANSPORTE_PASS=usuario1 - - # - # tdtp-paraderos: - # build: - # dockerfile: Dockerfile.paraderos - # image: dev.ilab.cl/tdtp/tdtp_paraderos:latest - # ports: - # - 4010:4000 - # environment: - # - TIMEOUT=1200 - # - TRANSPORTE_API=http://tdtp-admin:4000/api - # - TRANSPORTE_USER=11111111-1 - # - TRANSPORTE_PASS=usuario1 - - tdtp-proto: - build: - dockerfile: Dockerfile.proto - image: dev.ilab.cl/tdtp/tdtp_proto:latest - depends_on: - - dbredis - ports: - - 4005:4000 - environment: - - TZ=America/Santiago - - DB_REDIS_HOST=dbredis - - DB_REDIS_PORT=4081 - - - INTERVAL=20 - - BACKEND=http://swarm01.tdtp.ilab.cl:4001/gtfs-rt/api/concepcion - - - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://dev_feed:testing99901@db01.tdtp.ilab.cl/devrt - - TIMEOUT=1200 -# logging: -# driver: syslog -# options: -# syslog-address: "udp://rsyslog.arpa:514" -# tag: "{{.Name}}" -======= - VITE_TRANSPORTE_PASS=USER_PASSWORD image: dev.ilab.cl/tdtp/tdtp_cms:latest depends_on: @@ -146,7 +56,6 @@ services: - VITE_TRANSPORTE_USER=11111111-1 - VITE_TRANSPORTE_PASS=USER_PASSWORD ->>>>>>> f0b116a (test) tdtp-report-generator: build: @@ -158,17 +67,10 @@ 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: @@ -178,39 +80,6 @@ services: - 4007:4000 environment: - TZ=America/Santiago -<<<<<<< HEAD - - DEBUG=True - - SMTP_SERVER=pysmtp.ilab.cl - - SMTP_PORT=10025 - - SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://postgres:docker@db/test -# volumes: -# - path/to/gtfsrt_storage:/srv/gtfsrt -# - path/to/report_storage:/srv/reportes - - - - db: - image: postgres:14-alpine-geometry - # image: postgis/postgis:14-3.4-alpine - ports: - - 4080:5432 - environment: - POSTGRES_PASSWORD: password - POSTGRES_DB: database - - dbredis: - image: redis:7.2-alpine - - - dbmongo: - image: mongo:jammy - volumes: - - ./monngo/db:/data/db - - ./mongo/configdb:/data/configdb - 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