Vecna 3 месяцев назад
Родитель
Сommit
e93fd15e59
1 измененных файлов с 2 добавлено и 14 удалено
  1. 2 14
      scripts/belarus.sh

+ 2 - 14
scripts/belarus.sh

@@ -24,29 +24,17 @@ else
         # Do this step sequentially
         for i in ${months[@]}; do
             if [ ! -e data/bridge-extra-infos-${i}_processed.tar.xz ]; then
-                docker run --name "tp-belarus-${i}" --rm -d -i tp-analysis:latest || exit 1
-                docker exec tp-belarus-${i} sh -c "mkdir -p /home/analysis/belarus-2020-2021/data"
-                docker cp data/bridge-extra-infos-${i}.tar.xz tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/
-                docker exec tp-belarus-${i} sh -c "cd /home/analysis/belarus-2020-2021 && ./scripts/extract-extra-infos-archive.sh bridge-extra-infos-${i}.tar.xz"
-                docker cp tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/bridge_data/bridge-extra-infos-${i}_processed.tar.xz data/ && docker stop tp-belarus-${i}
+                ./scripts/process-data-docker.sh "$i"
             fi
         done
     else
         # Do this step in parallel
         for i in ${months[@]}; do
             if [ ! -e data/bridge-extra-infos-${i}_processed.tar.xz ]; then
-                docker run --name "tp-belarus-${i}" --rm -d -i tp-analysis:latest || exit 1
-                docker exec tp-belarus-${i} sh -c "mkdir -p /home/analysis/belarus-2020-2021/data"
-                docker cp data/bridge-extra-infos-${i}.tar.xz tp-belarus-${i}:/home/analysis/belarus-2020-2021/data
-                docker exec tp-belarus-${i} sh -c "cd /home/analysis/belarus-2020-2021 && ./scripts/extract-extra-infos-archive.sh bridge-extra-infos-${i}.tar.xz" &
+                ./scripts/process-data-docker.sh "$i" &
             fi
         done
         wait
-        for i in ${months[@]}; do
-            if [ ! -e data/bridge-extra-infos-${i}_processed.tar.xz ]; then
-                docker cp tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/bridge_data/bridge-extra-infos-${i}_processed.tar.xz data/ && docker stop tp-belarus-${i}
-            fi
-        done
     fi
 fi