From a3a7debdb095d02a67a0bf310dca3fd51b4930ae Mon Sep 17 00:00:00 2001 From: Dror Tirosh Date: Mon, 14 Oct 2024 15:24:31 +0300 Subject: [PATCH] remove docker-compose warnings --- empty.yml | 1 - runall.sh | 3 ++- runbundler/runbundler.yml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/empty.yml b/empty.yml index 025837f..0667b28 100644 --- a/empty.yml +++ b/empty.yml @@ -1,4 +1,3 @@ #first "docker-compose" file referenced by "runbundler" #Used to make sure all paths are relative to project root, #regardless from where the "real" docker-compose is loaded. -version: '3' diff --git a/runall.sh b/runall.sh index 8293638..23e22a2 100755 --- a/runall.sh +++ b/runall.sh @@ -59,7 +59,8 @@ name=`sed -ne 's/ *NAME=[ "]*\([^"]*\)"*/\1/p' $bundler` test -z $name && name=$basename echo "`date`: starting bundler $bundler, name=$name" | tee -a $outraw -if $root/runbundler/runbundler.sh $bundler pull-start; then +test -z "$CMD" && CMD=pull-start +if $root/runbundler/runbundler.sh $bundler $CMD ; then echo "`date`: started bundler $bundler, name=$name" | tee -a $outraw diff --git a/runbundler/runbundler.yml b/runbundler/runbundler.yml index 281ee8e..ca7d289 100644 --- a/runbundler/runbundler.yml +++ b/runbundler/runbundler.yml @@ -1,5 +1,4 @@ # docker-compose to bring up a single bundler, with all needed services -version: '3' services: