tyr-web

hove-io · Oct 18, 2024 · 76d89ae · 76d89ae
1 parent cfaa081
commit 76d89ae
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/docker/debian11/Dockerfile-tyr-web b/docker/debian11/Dockerfile-tyr-web
@@ -7,14 +7,14 @@ COPY ./source/tyr ./tyr
 COPY ./docker/ca-certificates/*.crt /usr/local/share/ca-certificates/
 COPY ./docker/run_tyr_web.sh /usr/src/app/run.sh
 
+RUN apt-get update --force-yes --fix-missing || exit 0
 
-RUN apt-get update --fix-missing \
-    && apt-get install -y curl libpq5 python3.9-dev python3-pip git ca-certificates libgeos-c1v5 postgresql-client \
+RUN apt-get install -y --force-yes curl libpq5 python3.9-dev python3-pip git ca-certificates libgeos-c1v5 postgresql-client \
     && 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 uwsgi==2.0.21 \
-    && rm -rf navitiacommon tyr \
+    && pip3 install --no-cache-dir uwsgi==2.0.22 \
+    && pip3 install --no-cache-dir -r /usr/share/tyr/requirements.txt \
     && chmod +x /usr/src/app/run.sh \
     && ln -sf /usr/share/tyr/migrations migrations \
     && ln -s /usr/bin/python3.9 /usr/bin/python \
@@ -24,9 +24,6 @@ RUN apt-get update --fix-missing \
         git \
     && apt-get autoremove -y
 
-
- # Python 'requests' package handle its own CA certificate list
- # Let's force it to use the OS's list
- ENV REQUESTS_CA_BUNDLE /etc/ssl/certs
+ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs
 
 ENTRYPOINT ["bash", "/usr/src/app/run.sh" ]