From eb55bc9def2b5d364762b893f5e51b00b8bed7a6 Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 28 Jan 2025 21:03:09 +0100 Subject: [PATCH] refactor: determine docker compose command based on system - Determine whether to use `docker compose` or `docker-compose` based on whether the former is available on the system at hand. - Use the `--remove-orphanS` flag, supported since v1.7.0, instead of its singular form which was removed at some point. --- scripts/reset-elastic.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/reset-elastic.sh b/scripts/reset-elastic.sh index 7adbe5c..4f158b7 100755 --- a/scripts/reset-elastic.sh +++ b/scripts/reset-elastic.sh @@ -1,11 +1,19 @@ #!/bin/bash +version=$(docker compose version) + +if [ $? -eq 0 ]; then + DRC_COMMAND="docker compose" +else + DRC_COMMAND="docker-compose" +fi + echo "warning this will run queries on the triplestore and delete containers, you have 3 seconds to press ctrl+c" sleep 3 -docker-compose rm -fs elasticsearch search +eval "$DRC_COMMAND rm -fs elasticsearch search" sudo rm -rf data/elasticsearch/ -docker-compose exec -T triplestore isql-v < { ?s ?p ?o. } }; exec('checkpoint'); exit; -EOF -docker-compose up -d --remove-orphan +EOF" +eval "$DRC_COMMAND up -d --remove-orphans"