Merge pull request #62 from brhahlen/dev

3.2.1
brhahlen · Sep 20, 2023 · 32ed12f · 32ed12f
2 parents d43720f + b8c392d
commit 32ed12f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Version 3.2.1
+## Bug Fix
+- Forgot to push everything
+
+# Version 3.2.0
+## Enhancement
+- Allow for different compose file names, fixes #60
+
 # Version 3.1.3
 ## Bug Fix
 - Fix `logs` command

diff --git a/build-files/CHANGELOG.md b/build-files/CHANGELOG.md
@@ -1,3 +1,3 @@
-# Version 3.1.3
+# Version 3.2.1
 ## Bug Fix
-- Fix `logs` command
+- Forgot to push everything
diff --git a/dc b/dc
@@ -6,7 +6,7 @@
 set -m
 
 # VERSION
-export DC_VERSION=v3.2.0-dev
+export DC_VERSION=v3.2.1
 
 ###### VARIABLES
 if [[ -z "${DC_DIR}" ]]; then
@@ -97,7 +97,7 @@ function tmp_dir_stack_files(){
 # TMP_STACK FILES AGE
 function tmp_stack_files_age(){
     tmp_dir_stack_files
-    for STACK in $(find "${DC_DIR}" \(-name compose.yaml -or -name compose.yml -or -name docker-compose.yaml -or -name docker-compose.yml \) -printf '%h \n' | sort -u);
+    for STACK in $(find "${DC_DIR}" \( -name compose.yaml -or -name compose.yml -or -name docker-compose.yaml -or -name docker-compose.yml \) -printf '%h \n' | sort -u);
     do
         STACK_NAME=$(basename "${STACK}")
         verbose_stack "${STACK}" "${STACK_NAME}"
@@ -347,7 +347,7 @@ function up(){
         printf "No argument provided, please use the name of a stack or all \n"
     elif [ "$1" == "all" ]; then
         printf "Bringing up all stacks \n"
-        for STACK in $(find "${DC_DIR}" -name docker-compose.yml -printf '%h\n' | sort -u);
+        for STACK in $(find "${DC_DIR}" \( -name compose.yaml -or -name compose.yml -or -name docker-compose.yaml -or -name docker-compose.yml \) -printf '%h\n' | sort -u);
         do
             STACK_NAME=$(basename "${STACK}")
             verbose_stack "${STACK}" "${STACK_NAME}"
@@ -382,7 +382,7 @@ function down(){
         printf "No argument provided, please use the name of a stack or all \n"
     elif [ "$1" == "all" ]; then
         printf "Bringing down all stacks \n"
-        for STACK in $(find "${DC_DIR}" -name docker-compose.yml -printf '%h\n' | sort -ur);
+        for STACK in $(find "${DC_DIR}" \( -name compose.yaml -or -name compose.yml -or -name docker-compose.yaml -or -name docker-compose.yml \) -printf '%h\n' | sort -ur);
         do
             STACK_NAME=$(basename "${STACK}")
             verbose_stack "${STACK}" "${STACK_NAME}"
@@ -419,7 +419,7 @@ function restart-stack-hard(){
         printf "No argument provided, please use the name of a stack or all \n"
     elif [ "$1" == "all" ]; then
         printf "Hard Restarting all stacks \n"
-        for STACK in $(find "${DC_DIR}" -name docker-compose.yml -printf '%h\n' | sort -u);
+        for STACK in $(find "${DC_DIR}" \( -name compose.yaml -or -name compose.yml -or -name docker-compose.yaml -or -name docker-compose.yml \) -printf '%h\n' | sort -u);
         do
             STACK_NAME=$(basename "${STACK}")
             verbose_stack "${STACK}" "${STACK_NAME}"
@@ -457,7 +457,7 @@ function restart-stack-soft(){
         printf "No argument provided, please use the name of a stack or all \n"
     elif [ "$1" == "all" ]; then
         printf "Restarting all stacks \n"
-        for STACK in $(find "${DC_DIR}" -name docker-compose.yml -printf '%h\n' | sort -u);
+        for STACK in $(find "${DC_DIR}" \( -name compose.yaml -or -name compose.yml -or -name docker-compose.yaml -or -name docker-compose.yml \) -printf '%h\n' | sort -u);
         do
             STACK_NAME=$(basename "${STACK}")
             verbose_stack "${STACK}" "${STACK_NAME}"

diff --git a/dc-completion b/dc-completion
@@ -2,7 +2,7 @@
 # Copyright (C) 2022 - 2023 Ben Hählen
 # This is the completion file for `dc`
 ##############
-# Version 3.2.0
+# Version 3.2.1
 ##############
 _dc_completions()
 {