feat: docker-composer command as variable

allows to switch to 'docker compose'

Author: rugbymauri

Makefile

@@ -10,6 +10,6 @@ function _addSshKey() {
 
     local oldPwd=$(pwd)
     cd ${ROOT_DIR}
-    docker-compose exec ssh-agent sh -c /import-keys.sh
+    ${DOCKER_COMPOSE} exec ssh-agent sh -c /import-keys.sh
     cd ${oldPwd}
 }

commands/_internals/addSshKey.sh

@@ -11,5 +11,5 @@ _serviceExists() {
 }
 
 _existingServices() {
-    docker-compose ps --services
+    ${DOCKER_COMPOSE} ps --services
 }

commands/_internals/serviceExists.sh

@@ -1,6 +1,8 @@
 # custom Browser for the open command
 #DDE_BROWSER=/usr/bin/firefox
 
+#DOCKER_COMPOSE='docker compose'
+
 function _local_someGlobalHelperFunction() {
     echo "a global helper function"
 }

commands/local.sh.dist

@@ -8,7 +8,7 @@ function project:destroy() {
     _checkProject
 
     _logYellow "Removing containers"
-    docker-compose down --remove-orphans
+    ${DOCKER_COMPOSE} down --remove-orphans
 
     _logYellow "Deleting SSL certs"
 

commands/project/destroy.sh

@@ -20,7 +20,7 @@ function project:env() {
 
     echo ""
     _logYellow "Project services"
-    docker-compose ps --services
+    ${DOCKER_COMPOSE} ps --services
 
 }
 

commands/project/env.sh

@@ -21,7 +21,7 @@ function project:exec() {
         fi
     fi
 
-    docker-compose exec ${service} /bin/sh -c "if [ -f /usr/bin/doas ]; then doas -u dde sh; else gosu dde sh; fi"
+    ${DOCKER_COMPOSE} exec ${service} /bin/sh -c "if [ -f /usr/bin/doas ]; then doas -u dde sh; else gosu dde sh; fi"
 }
 
 function p:e() {

commands/project/exec.sh

@@ -7,7 +7,7 @@
 
 function project:exec:root() {
     _checkProject
-    docker-compose exec $(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//') sh
+    ${DOCKER_COMPOSE} exec $(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//') sh
 }
 
 function p:e:r() {

commands/project/exec/root.sh

@@ -20,7 +20,7 @@ function project:log() {
         fi
     fi
 
-    docker-compose logs -f --tail=100 ${service}
+    ${DOCKER_COMPOSE} logs -f --tail=100 ${service}
 }
 
 function p:l() {

commands/project/log.sh

@@ -13,7 +13,7 @@ function project:open() {
 
     _serviceExists web
 
-    for openUrl in $(docker-compose config | _yq_stdin e '.services.*.environment.OPEN_URL'); do
+    for openUrl in $(${DOCKER_COMPOSE} config | _yq_stdin e '.services.*.environment.OPEN_URL'); do
         if [[ "${openUrl}" != "null" ]]; then
             _logGreen "open ${openUrl}"