From 7a81800cea953f1a32a92ff0ba0422bbfe2f0808 Mon Sep 17 00:00:00 2001 From: David Quintanel Date: Wed, 16 Oct 2024 15:20:06 +0200 Subject: [PATCH] make tyr-beat work --- docker/debian11/Dockerfile-tyr-beat | 11 +++++------ docker/run_tyr_beat.sh | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/debian11/Dockerfile-tyr-beat b/docker/debian11/Dockerfile-tyr-beat index 3fb1781529..4a58290269 100644 --- a/docker/debian11/Dockerfile-tyr-beat +++ b/docker/debian11/Dockerfile-tyr-beat @@ -5,22 +5,21 @@ WORKDIR /usr/share/tyr/ COPY ./source/navitiacommon ./navitiacommon COPY ./source/tyr ./tyr COPY ./docker/ca-certificates/*.crt /usr/local/share/ca-certificates/ -COPY ./docker/run_tyr_beat.sh ./run.sh +COPY ./docker/run_tyr_beat.sh /run.sh COPY ./source/sql/alembic /usr/share/navitia/ed/alembic COPY ./source/sql/requirements.txt /tmp/requirements.txt COPY ./source/cities /usr/share/navitia/cities COPY ./docker/templates/* /templates/ +RUN chmod +x /run.sh + RUN apt-get update --fix-missing \ - && apt-get install -y --force-yes libpq5 python3.9-dev python3-pip git ca-certificates postgresql-client gettext-base jq \ + && apt-get install -y --force-yes libgeos-dev libpq5 python3.9-dev python3-pip git ca-certificates postgresql-client gettext-base jq \ && update-ca-certificates \ && (cd navitiacommon && python3 setup.py install) \ && (cd tyr && python3 setup.py install && pip3 install --no-cache-dir -U -r requirements.txt)\ && pip3 install --no-cache-dir -U -r /tmp/requirements.txt \ - && rm -rf navitiacommon tyr \ - && apt-get purge -y \ - python3-pip \ - git \ + && apt-get purge -y git \ && apt-get autoremove -y ENTRYPOINT ["bash", "/run.sh"] diff --git a/docker/run_tyr_beat.sh b/docker/run_tyr_beat.sh index d3a959df77..302f0eb4b0 100644 --- a/docker/run_tyr_beat.sh +++ b/docker/run_tyr_beat.sh @@ -63,4 +63,4 @@ while read var ; do done < <(env) -exec celery beat -A tyr.tasks +exec celery -A tyr.tasks beat