feat(osrm): upgrade to 6.0.0. feat(valhalla): 3.6.1

Author: azarz

changelog.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 4.0.0
+UPDATED :
+- (breaking) upgrade OSRM to 6.0.0
+- upgrade Valhalla to 3.6.1, using main repo instead of custom one
+
 ## 3.1.5
 FIXED :
 - database manager does not raie error when retries have failed
@@ -18,7 +23,7 @@ CHANGED:
 
 ## 3.1.0
 ADDED:
-- fields vla_par_defaut, cout_penalites, vehicule_leger_interdit, cout_vehicule_prioritaire 
+- fields vla_par_defaut, cout_penalites, vehicule_leger_interdit, cout_vehicule_prioritaire
 
 ## 3.0.0
 REMOVED:

docker/debian/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10.9-slim-bullseye as build
+FROM python:3.10.19-slim-trixie as build
 
 ### Installation des dépendances
 RUN apt update && apt install -y wget git g++ cmake libboost-dev libboost-filesystem-dev libboost-thread-dev \
@@ -9,7 +9,7 @@ RUN apt update && apt install -y wget git g++ cmake libboost-dev libboost-filesy
 
 ### Installation d'OSRM
 WORKDIR /home/osrm/
-RUN wget https://github.com/Project-OSRM/osrm-backend/archive/v5.26.0.tar.gz && tar -xzf v5.26.0.tar.gz && cd osrm-backend-5.26.0 && \
+RUN wget https://github.com/Project-OSRM/osrm-backend/archive/v6.0.0.tar.gz && tar -xzf v6.0.0.tar.gz && cd osrm-backend-6.0.0 && \
     mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . && cmake --build . --target package
 
 ### Installation de Valhalla
@@ -27,7 +27,7 @@ cmake -B build . && cmake --build build && make -C build install
 
 WORKDIR /home/valhalla/
 RUN pip install --upgrade "conan<2.0.0"
-RUN git clone --branch 3.2.0-with_hard_exclude --depth 1 --recursive https://github.com/IGNF/valhalla.git && cd valhalla && \
+RUN git clone --branch 3.6.1 --depth 1 --recursive https://github.com/valhalla/valhalla.git && cd valhalla && \
 mkdir build && cmake -B build -DCMAKE_BUILD_TYPE=Release && make -C build && make -C build package
 
 FROM python:3.10.9-slim-bullseye as r2gg
@@ -51,7 +51,7 @@ RUN apt-get update && \
 RUN apt-get install -y git libcurl4-openssl-dev libzmq3-dev libczmq-dev
 
 ### Installation d'OSRM
-COPY --from=build /home/osrm/osrm-backend-5.26.0/build/OSRM-0.1.1-Linux.tar.gz ./
+COPY --from=build /home/osrm/osrm-backend-6.0.0/build/OSRM-0.1.1-Linux.tar.gz ./
 RUN tar -xzvf OSRM-0.1.1-Linux.tar.gz && cd OSRM-0.1.1-Linux && cp -r bin/* /usr/bin/ && cp -r lib/* /usr/lib/ && cp -r include/* /usr/include/ && cp -r share/* /usr/share/
 
 ### Installation prime-server
@@ -60,8 +60,8 @@ COPY --from=build /usr/local/lib/libprime_server.so.0 /usr/lib/libprime_server.s
 COPY --from=build /usr/local/lib/libprime_server.so /usr/lib/libprime_server.so
 
 ### Installation de valhalla
-COPY --from=build /home/valhalla/valhalla/build/valhalla-3.2.0-Linux.tar.gz ./
-RUN tar -xzvf valhalla-3.2.0-Linux.tar.gz && cd valhalla-3.2.0-Linux && cp -r bin/* /usr/bin/ && cp -r lib/* /usr/lib/ && cp -r include/* /usr/include/ && cp -r share/* /usr/share/
+COPY --from=build /home/valhalla/valhalla/build/valhalla-3.6.1-Linux.tar.gz ./
+RUN tar -xzvf valhalla-3.6.1-Linux.tar.gz && cd valhalla-3.6.1-Linux && cp -r bin/* /usr/bin/ && cp -r lib/* /usr/lib/ && cp -r include/* /usr/include/ && cp -r share/* /usr/share/
 
 ### Installation des dépendances pour psycopg2
 RUN apt update && \