From b9b44d2530c8619b48f4c328756524cf061025d7 Mon Sep 17 00:00:00 2001 From: Gerhard Salvini Date: Tue, 19 Mar 2024 09:07:56 +0100 Subject: [PATCH] Using standardized conditions for starting transfair --- bbmri/modules/ehds2-compose.yml | 13 ++++++++++++- lib/functions.sh | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bbmri/modules/ehds2-compose.yml b/bbmri/modules/ehds2-compose.yml index 6475199..070d87f 100644 --- a/bbmri/modules/ehds2-compose.yml +++ b/bbmri/modules/ehds2-compose.yml @@ -48,7 +48,18 @@ services: restart: on-failure #command: sh -c "sleep 60 && rm -rf /app/test/* && ([ ! -f "/app/lock" && ] && java -jar transFAIR.jar && touch "/app/lock) && tail -f /dev/null" #command: sh -c "sleep 60 && rm -rf /app/test/* && java -jar transFAIR.jar && tail -f /dev/null" - command: sh -c "echo listing /app/data && ls -la /app/data && /app/launch.sh" + #command: sh -c "echo listing /app/data && ls -la /app/data && /app/launch.sh" + #command: sh -c "echo listing /app/data && ls -la /app/data && [ "$(ls -A /app/data)" ] && [ ! -f "/app/data/lock" ] && /app/launch.sh & tail -f /dev/null" + #command: sh -c "echo listing /app/data && ls -la /app/data && [ ! -z "$(ls -A /app/data)" ] && [ ! -f "/app/data/lock" ] && /app/launch.sh & tail -f /dev/null" + #command: bash -c "echo listing /app/data && ls -la /app/data && [ ! -z "$(ls -A /app/data)" ] && [ ! -f "/app/data/lock" ] && /app/launch.sh & tail -f /dev/null" + #command: bash -c "echo listing /app/data && ls -la /app/data && [ ! -f "/app/data/lock" ] && /app/launch.sh & tail -f /dev/null" + #command: bash -c "echo listing /app/data && ls -la /app/data && [ ! -z "$(find /app/data -mindepth 1 -maxdepth 1)" ] && [ ! -f "/app/data/lock" ] && /app/launch.sh & tail -f /dev/null" + #command: bash -c "echo listing /app/data && ls -la /app/data && [ ! -z $(ls -A /app/data) ] && [ ! -f /app/data/lock ] && /app/launch.sh & tail -f /dev/null" + #command: bash -c "echo listing /app/data && ls -la /app/data && [ ! -f /app/data/lock ] && /app/launch.sh & tail -f /dev/null" # works! + #command: bash -c "echo listing /app/data && ls -la /app/data && [ ! -z `ls -A /app/data` ] && [ ! -f /app/data/lock ] && /app/launch.sh & tail -f /dev/null" + #command: bash -c "echo listing /app/data && ls -la /app/data && [ -f /app/data/*.csv ] && [ ! -f /app/data/lock ] && /app/launch.sh & tail -f /dev/null" # works! + command: bash -c "echo listing /app/data && ls -la /app/data && [ -f /app/data/*.[cC][sS][vV] ] && [ ! -f /app/data/lock ] && /app/launch.sh & tail -f /dev/null" + #command: sh -c "echo listing /app/data && ls -la /app/data && [ ! -z $(ls -A /app/data) ] && [ ! -f /app/data/lock ] && /app/launch.sh & tail -f /dev/null" #command: sh -c "rm -rf /app/test/* && java -jar transFAIR.jar" volumes: #- /home/gerhard/Projects/EHDS2/PrototypeSpring2024/test/:/app/test/ diff --git a/lib/functions.sh b/lib/functions.sh index f84e791..b32aabe 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -284,7 +284,7 @@ function build_transfair() { # # 1. There is no data lock file (which means that no ETL has yet been run) and # 2. There is data available. - if [ ! -f "../ecdc/data/lock" ] && [ ! -z "$(ls -A ../ecdc/data)" ]; then + if [ -f ../ecdc/data/*.[cC][sS][vV] ] && [ ! -f ../ecdc/data/lock ]; then cd $base_dir/transfair docker build --progress=plain -t samply/transfair --no-cache . cd -