From 06533fb32b572664d5f01f7f1f88ec4b6cc3acc9 Mon Sep 17 00:00:00 2001 From: Israel Figueroa Date: Mon, 29 Jul 2024 17:56:03 -0400 Subject: [PATCH] test --- Docker_service.zip | Bin 0 -> 2748 bytes Dockerfile.admin | 39 +++++++++++++-- Dockerfile.downloads | 3 ++ Dockerfile.proto | 19 ++++++- README.md | 15 ++++++ docker-compose.sample.yaml | 98 +++++++++++++++++++++++++++++++++++++ 6 files changed, 169 insertions(+), 5 deletions(-) create mode 100644 Docker_service.zip diff --git a/Docker_service.zip b/Docker_service.zip new file mode 100644 index 0000000000000000000000000000000000000000..dc95a626321bb8a36ca15e820dd6d53c86af7e66 GIT binary patch literal 2748 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 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 ["project/manage.py", "runserver", "0.0.0.0:4000"] +CMD [ "/srv/project/manage.py", "runserver", "0.0.0.0:4000" ] diff --git a/Dockerfile.downloads b/Dockerfile.downloads index 813a87a..6bbf68b 100644 --- a/Dockerfile.downloads +++ b/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"] diff --git a/Dockerfile.proto b/Dockerfile.proto index 291daf8..74007e6 100644 --- a/Dockerfile.proto +++ b/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"] diff --git a/README.md b/README.md index 97bc085..4674f88 100644 --- a/README.md +++ b/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. diff --git a/docker-compose.sample.yaml b/docker-compose.sample.yaml index 14e6307..b010708 100644 --- a/docker-compose.sample.yaml +++ b/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" ' + + - 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)