other
parent
f705effbcc
commit
6dad4947f2
|
@ -1,18 +1,11 @@
|
|||
<<<<<<< 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://for_testing:glpat-mQEdGjBW9M1nDbCCuvzi@gitlab.com/m3f_usm/admin_transporte/frontend" /frontend
|
||||
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 git clone https://72d861f982d2a76275d5b8178fe0633b19c43d33@dev.ilab.cl/TDTP/admin_transporte_backend /backend
|
||||
RUN rm -rf /backend/project/dist
|
||||
|
||||
# Compilar
|
||||
|
@ -29,10 +22,6 @@ RUN useradd -m app
|
|||
|
||||
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
|
||||
|
@ -41,7 +30,6 @@ 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
|
||||
|
||||
|
|
|
@ -18,10 +18,6 @@ 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"]
|
||||
|
|
|
@ -1,11 +1,4 @@
|
|||
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
|
||||
|
||||
|
@ -21,19 +14,12 @@ RUN echo apscheduler >> /srv/requirements.txt
|
|||
|
||||
RUN pip install --no-cache-dir -r /srv/requirements.txt
|
||||
|
||||
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"]
|
||||
|
|
|
@ -120,4 +120,3 @@ services:
|
|||
# environment:
|
||||
# POSTGRES_PASSWORD: POSTGRES_PASSWORD
|
||||
# POSTGRES_DB: desarrollo10
|
||||
>>>>>>> f0b116a (test)
|
||||
|
|
Loading…
Reference in New Issue