Merge remote-tracking branch 'origin/feat-per-project-branches'

# Conflicts: # dit
abnegate · Jul 26, 2022 · 78ed721 · 78ed721
2 parents bdfa2e4 + ab168a7
commit 78ed721
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/dit b/dit
@@ -59,7 +59,7 @@ diff() {
 # Bring down project
 #
 down() {
-  docker compose --project-name "$(branch)" down $*
+  docker compose --project-name "$(__get_project)" down "$@"
 }
 
 #
@@ -98,7 +98,7 @@ push() {
 # Restart project
 #
 restart() {
-  docker compose --project-name "$(branch)" restart "$@"
+  docker compose --project-name "$(__get_project)" restart "$@"
 }
 
 #
@@ -211,10 +211,8 @@ reup() {
     shift
   done
 
-  docker compose --project-name "$(branch)" down ${volumes}
-
-  # shellcheck disable=SC2086
-  docker compose --project-name "$(branch)" up ${up}
+  docker compose --project-name "$(__get_project)" down ${volumes}
+  docker compose --project-name "$(__get_project)" up ${up}
 }
 
 #
@@ -246,12 +244,10 @@ run() {
       exit 1
     fi
 
-    # shellcheck disable=SC2086
     docker run --rm --interactive --tty "${image}" ${args}
   fi
 
-  # shellcheck disable=SC2086
-  docker compose --project-name "$(branch)" exec --interactive --tty ${args}
+  docker compose --project-name "$(__get_project)" exec --interactive --tty ${args}
 }
 
 #
@@ -435,7 +431,7 @@ up() {
   done
 
   # shellcheck disable=SC2086
-  docker compose --project-name "$(branch)" up ${up}
+  docker compose --project-name "$(__get_project)" up ${up}
 
   __save_branch
 }