corrections

.github/workflows/dockers_builder.yml

@@ -8,7 +8,6 @@ on:
       - '*'
 
 env:
-
   front_debian8_components: 'tyr-web instances-configurator'
   backend_debian8_components: 'kraken tyr-beat tyr-worker mock-kraken eitri'
 
@@ -17,7 +16,6 @@ env:
   PRD_ECR_REGISTRY: "162230498103.dkr.ecr.eu-west-1.amazonaws.com"
 
 jobs:
-
   common_variables:
     name: Common variables
     runs-on: [self-hosted, corefront, sandbox]
@@ -232,9 +230,6 @@ jobs:
           docker tag navitia/tyr-worker ${tyr_worker_tag}
           docker push ${tyr_worker_tag}
 
-
-
-
       - name: failure notification
         if: failure()
         run: |
@@ -273,7 +268,6 @@ jobs:
           submodules: recursive
           token: ${{ steps.ci-core-app-token.outputs.token }}
 
-
       - name: Login to Amazon ECR
         uses: aws-actions/amazon-ecr-login@v1
         env:
@@ -331,13 +325,11 @@ jobs:
           rm -rf ./.??*
 
 
-
   publish_aws:
     runs-on: [self-hosted, corefront, sandbox]
     name: Aws Dispatch (Dev)
     needs: [debian8_front_images, debian8_back_images, debian11_images, common_variables]
     steps:
-
       - name: Generate token for aws images
         id: app-token
         uses: getsentry/[email protected]
@@ -363,7 +355,6 @@ jobs:
           event-type: build-trigger
           client-payload: '{"branch": "release", "tag": "${{ needs.common_variables.outputs.RELEASE_TAG }}"}'
 
-
       - name: failure notification
         if: failure()
         run: |

docker/build_kraken_deb11.sh

@@ -4,7 +4,7 @@ cd /navitia/navitia/
 mkdir -p docker_build && cd docker_build
 cmake -DCMAKE_BUILD_TYPE=Release ../source
 make -j$(($(grep -c '^processor' /proc/cpuinfo)+1)) protobuf_files
-make -j$(($(grep -c '^processor' /proc/cpuinfo) + 1)) kraken
+make -j$(($(grep -c '^processor' /proc/cpuinfo)+1)) kraken
 
 # Build libkeepalive https://libkeepalive.sourceforge.net/
 # libkeepalive is a library to keep tcp connection alive. The reason of doing so is that aws LoadBalancer, to which

docker/debian11/Dockerfile-builder-kraken

@@ -7,12 +7,4 @@ RUN git config --global --add safe.directory /navitia/navitia
 COPY docker/build_kraken_deb11.sh /build_navitia.sh
 RUN chmod +x /build_navitia.sh
 
-# install a more recent version of CMake
-RUN apt-get remove --yes cmake \
-    && cd /tmp \
-    && wget https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz \
-    && tar xf cmake-3.18.6-Linux-x86_64.tar.gz --strip-components=1 --directory=/usr/local \
-    && rm -f cmake-3.18.6-Linux-x86_64.tar.gz \
-    && cd -
-
 ENTRYPOINT ["bash", "/build_navitia.sh"]

source/kraken/CMakeLists.txt

@@ -36,7 +36,7 @@ target_link_libraries(fill_disruption_from_database
 
 add_executable(kraken kraken_zmq.cpp)
 target_link_libraries(kraken workers ${NAVITIA_ALLOCATOR} ${Boost_THREAD_LIBRARY})
-add_dependencies(kraken protobuf_files)
+add_dependencies(kraken protobuf_files prometheus-cpp::pull)
 
 install(TARGETS kraken DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)