From fbd02757c4c4c05437d443680e89d16cf08a0ba2 Mon Sep 17 00:00:00 2001 From: Israel Figueroa Date: Sun, 10 Mar 2024 00:58:06 -0300 Subject: [PATCH] proto1 --- Dockerfile.admin | 13 +++++++++---- Dockerfile.admindevelfull | 11 +++++++++-- Dockerfile.adminfull | 11 +++++++++-- Dockerfile.cms | 10 ++++++---- Dockerfile.proto | 22 ++++++++++++++++------ fetch.backend_proto.py | 12 ++++++++++++ 6 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 fetch.backend_proto.py diff --git a/Dockerfile.admin b/Dockerfile.admin index 6a5fc79..27f17ae 100644 --- a/Dockerfile.admin +++ b/Dockerfile.admin @@ -1,12 +1,17 @@ -FROM python:3.11-alpine -RUN apk update -RUN apk add git +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 -RUN pip install -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt + +RUN chown -R app:app /srv +USER app ENTRYPOINT ["python3"] diff --git a/Dockerfile.admindevelfull b/Dockerfile.admindevelfull index d414ff6..29369d8 100644 --- a/Dockerfile.admindevelfull +++ b/Dockerfile.admindevelfull @@ -13,13 +13,17 @@ WORKDIR /frontend RUN npm install && npm run build # Contenedor backend -FROM python:3.11-alpine +FROM python:3.11-slim + +RUN apt-get update && apt-get -y install git && apt-get clean + +RUN useradd -m app WORKDIR /srv # Actualiza el contenido COPY --from=frontend /backend/requirements.txt /srv -RUN pip install -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt COPY --from=frontend /backend/readme.md /srv COPY --from=frontend /frontend/dist/ /srv/project/dist @@ -27,5 +31,8 @@ COPY --from=frontend /backend/project/ /srv/project COPY paradero.admin_transporte_backend.py /srv/project/api/views/paradero.py +RUN chown -R app:app /srv +USER app + ENTRYPOINT ["python3"] CMD [ "/srv/project/manage.py", "runserver", "0.0.0.0:4000" ] diff --git a/Dockerfile.adminfull b/Dockerfile.adminfull index dfbbddd..c17b069 100644 --- a/Dockerfile.adminfull +++ b/Dockerfile.adminfull @@ -13,13 +13,17 @@ WORKDIR /frontend RUN npm install && npm run build # Contenedor backend -FROM python:3.11-alpine +FROM python:3.11-slim + +RUN apt-get update && apt-get -y install git && apt-get clean + +RUN useradd -m app WORKDIR /srv # Actualiza el contenido COPY --from=frontend /backend/requirements.txt /srv -RUN pip install -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt COPY --from=frontend /backend/readme.md /srv COPY --from=frontend /frontend/dist/ /srv/project/dist @@ -27,5 +31,8 @@ COPY --from=frontend /backend/project/ /srv/project COPY paradero.admin_transporte_backend.py /srv/project/api/views/paradero.py +RUN chown -R app:app /srv +USER app + ENTRYPOINT ["python3"] CMD [ "/srv/project/manage.py", "runserver", "0.0.0.0:4000" ] diff --git a/Dockerfile.cms b/Dockerfile.cms index 083ec0c..f1fedb5 100644 --- a/Dockerfile.cms +++ b/Dockerfile.cms @@ -1,12 +1,14 @@ -FROM python:3.11-alpine -RUN apk update -RUN apk add git +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/cms_backend /srv WORKDIR /srv -RUN pip install -r myproject/requirements.txt +RUN pip install --no-cache-dir -r myproject/requirements.txt ENTRYPOINT ["python3"] diff --git a/Dockerfile.proto b/Dockerfile.proto index aac3865..7aa12fa 100644 --- a/Dockerfile.proto +++ b/Dockerfile.proto @@ -1,12 +1,22 @@ -FROM python:3.11-alpine -RUN apk update -RUN apk add git +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/proto_backend /srv +EXEC echo apscheduler >> /srv/requirements.txt + +COPY fetch.backend_proto.py /srv/fetch.py + +RUN pip install --no-cache-dir -r /srv/requirements.txt + WORKDIR /srv -RUN pip install -r requirements.txt +RUN chown -R app:app /srv +USER app -ENTRYPOINT ["watch"] -CMD ["-n", "30", "-t", "python", "main.py"] +ENTRYPOINT ["python"] + +CMD ["fetch.py"] diff --git a/fetch.backend_proto.py b/fetch.backend_proto.py new file mode 100644 index 0000000..b8f5734 --- /dev/null +++ b/fetch.backend_proto.py @@ -0,0 +1,12 @@ +# coding: utf-8 +from apscheduler.schedulers.background import BlockingScheduler +from main import main as rutina_principal +import logging + +sched = BlockingScheduler() +sched.add_job(rutina_principal, 'interval', seconds=int(os.environ.get('INTERVAL'))) #will do the print_t work for every 30 seconds + + +if __name__ == '__main__': + init_db(db, engine) + sched.start()