Merge pull request #4345 from hove-io/revert-4344-generate_tyr_worker

Revert "Generate tyr worker"

Author: azime

.github/workflows/dockers_builder.yml

@@ -15,8 +15,6 @@ env:
   SBX_ECR_REGISTRY_BACKEND: "110444322584.dkr.ecr.eu-west-1.amazonaws.com"
   SBX_ECR_REGISTRY_FRONT: "051314639660.dkr.ecr.eu-west-1.amazonaws.com"
   PRD_ECR_REGISTRY: "162230498103.dkr.ecr.eu-west-1.amazonaws.com"
-  SBX_ECR_MIMIR_REGISTRY: "026897623940.dkr.ecr.eu-west-1.amazonaws.com"
-
 
 jobs:
 
@@ -164,6 +162,15 @@ jobs:
           target: 'cosmogony2cities_.deb'
           token: ${{ steps.ci-core-app-token.outputs.token }}
 
+      - name: Download mimirsbrunn package
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: 'hove-io/mimirsbrunn'
+          version: 'tags/v3.1.0'
+          file: 'mimirsbrunn7_jessie-3.1.0.deb'
+          target: 'mimirsbrunn7_jessie-.deb'
+          token: ${{ steps.ci-core-app-token.outputs.token }}
+
       - name: Download mimir-config package
         uses: dsaltares/fetch-gh-release-asset@master
         with:
@@ -180,22 +187,7 @@ jobs:
         with:
           # 162230498103 : shared
           # 110444322584 : kraken sbx
-          registries: "162230498103,110444322584,051314639660,026897623940"
-
-      - name: Get and tag mimir dev image
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          image=${SBX_ECR_MIMIR_REGISTRY}/mimirsbrunn:latest
-          docker pull ${image}
-          docker tag ${image} mimirsbrunn:local
-
-      - name: Get and tag mimir release image
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-            MIMIR_TAG="v3.1.0"
-            image=${PRD_ECR_REGISTRY}/navitia-bragi-mimirsbrunn:${MIMIR_TAG}
-            docker pull ${image}
-            docker tag ${image} mimirsbrunn:local
+          registries: "162230498103,110444322584,051314639660"
 
       - name: Create master docker
         run: |
@@ -240,6 +232,9 @@ jobs:
           docker tag navitia/tyr-worker ${tyr_worker_tag}
           docker push ${tyr_worker_tag}
 
+
+
+
       - name: failure notification
         if: failure()
         run: |
@@ -335,6 +330,8 @@ jobs:
           rm -rf ./*
           rm -rf ./.??*
 
+
+
   publish_aws:
     runs-on: [self-hosted, corefront, sandbox]
     name: Aws Dispatch (Dev)
@@ -373,6 +370,7 @@ jobs:
           sudo apt update && sudo apt install -y httpie
           echo '{"text":":warning: Github Actions: dockers_builder the job publish_aws failed !"}' | http --json POST ${{secrets.SLACK_NAVITIA_TEAM_URL}}
 
+
   run_artemis:
     runs-on: [self-hosted, corefront, sandbox]
     needs: [publish_aws]

docker/debian8/Dockerfile-tyr-worker

@@ -1,5 +1,3 @@
-FROM mimirsbrunn:local AS mimir_bins
-
 FROM navitia/master
 
 # Install some binaries from tartare-tools
@@ -19,7 +17,7 @@ RUN cd tartare-tools \
     && cd .. \
     && rm -rf tartare-tools
 
-COPY navitia-common_*deb navitia-tyr_*.deb navitia-ed_*.deb  navitia-cities_*.deb cosmogony2cities_*.deb  mimirsbrunn-config-*.deb ./
+COPY navitia-common_*deb navitia-tyr_*.deb navitia-ed_*.deb  navitia-cities_*.deb  mimirsbrunn7_jessie-*.deb  cosmogony2cities_*.deb  mimirsbrunn-config-*.deb ./
 
 # install navitia-common package
 RUN dpkg -i ./navitia-common_*.deb || exit 0
@@ -33,8 +31,10 @@ RUN dpkg -i ./navitia-ed_*.deb || exit 0
 # install navitia-cities package
 RUN dpkg -i ./navitia-cities_*.deb || exit 0
 
-# install cosmogony2cities package
-RUN dpkg -i ./cosmogony2cities*.deb \
+# install navitia-mimirsbrunn package
+RUN dpkg -i ./mimirsbrunn7_jessie-*.deb \
+        # install cosmogony2cities package
+        ./cosmogony2cities*.deb \
         # install conf mimir package
         ./mimirsbrunn-config-*.deb
 
@@ -45,11 +45,9 @@ RUN rm navitia-common_*deb \
     navitia-cities_*.deb \
     navitia-ed_*.deb \
     mimirsbrunn-config-*.deb \
+    mimirsbrunn7_jessie-*.deb \
     cosmogony2cities_*.deb
 
-# Copy: osm2mimir7 && cosmogony2mimir7 && bano2mimir7 && openaddresses2mimir7 && ntfs2mimir7 && poi2mimir7 && ctlmimir7
-COPY --from=mimir_bins /usr/bin/*mimir7 /usr/bin/
-
 # install tyr requirements
 RUN pip install --no-cache-dir -r /usr/share/tyr/requirements.txt