Make docker-compose flexible

Author: jason-fox

.github/workflows/ci.yml

@@ -28,4 +28,4 @@ jobs:
         ./services create || true
     - name: Run Script
       run: |
-        ./services start && ./services stop
+        ./services start test && ./services stop test

services

@@ -2,13 +2,16 @@
 #
 #  Command Line Interface to start all services associated with the Getting-Started Tutorial
 #
-#  For this tutorial the commands are merely a convenience script to run docker-compose
-#
+#  For this tutorial the commands are merely a convenience script to run ${dockerCmd}#
 
 set -e
 
-if (( $# != 1 )); then
-    echo "Illegal number of parameters"
+dockerCmd="docker compose"
+if (( $# == 2 )); then
+    dockerCmd="docker-compose"
+fi
+
+if (( $# < 1 )); then    echo "Illegal number of parameters"
     echo "usage: services [create|start|stop]"
     exit 1
 fi
@@ -25,7 +28,7 @@ stoppingContainers () {
 	echo -e "Force removal of \033[1mmqtt-subscriber\033[0m"
 	(docker stop mqtt-subscriber &>/dev/null) || (echo -e "\033[1mmqtt-subscriber\033[0m not running")
 	echo "Stopping running containers"
-	docker-compose down -v --remove-orphans
+	${dockerCmd} down -v --remove-orphans
 }
 
 displayServices () {
@@ -110,7 +113,7 @@ case "${command}" in
 		echo -e "- \033[1mTutorial\033[0m acts as a series of dummy IoT Sensors over MQTT"
 		echo -e "- \033[1mMosquitto\033[0m acts as an MQTT Message Broker"
 		echo ""
-		docker-compose up -d --remove-orphans
+		${dockerCmd} up -d --remove-orphans
 		waitForMongo
 		addDatabaseIndex
 		waitForOrion
@@ -126,7 +129,7 @@ case "${command}" in
 		export $(cat .env | grep "#" -v)
 		echo "Pulling Docker images"
 		docker pull curlimages/curl
-		docker-compose pull
+		${dockerCmd} pull 
 		;;
 	*)
 		echo "Command not Found."