diff --git a/internal/dockercompose/dockercompose.go b/internal/dockercompose/dockercompose.go index c130a12..c271aef 100644 --- a/internal/dockercompose/dockercompose.go +++ b/internal/dockercompose/dockercompose.go @@ -75,7 +75,7 @@ func FindServices(root string, force bool) (DockermiTypes.ServiceScriptReturn, e } else if activeExists { color.Yellow("Service '%s' is inactive (dockermi.active=false). Skipping...", serviceName) } else { - color.Red("Service '%s' is missing 'dockermi.order' or 'dockermi.active' labels. Skipping...", serviceName) + color.HiYellowString("Service '%s' is missing 'dockermi.order' or 'dockermi.active' labels. Skipping...", serviceName) } } return nil @@ -139,7 +139,7 @@ func FindServicesWithKey(root string) (map[string][]DockermiTypes.ServiceScript, } else if activeExists { color.Yellow("Service '%s' is inactive (dockermi.active=false). Skipping...", serviceName) } else { - color.Red("Service '%s' is missing 'dockermi.order' or 'dockermi.active' labels. Skipping...", serviceName) + color.HiYellowString("Service '%s' is missing 'dockermi.order' or 'dockermi.active' labels. Skipping...", serviceName) } } return nil diff --git a/internal/script/script.go b/internal/script/script.go index c928ed9..469b9d5 100644 --- a/internal/script/script.go +++ b/internal/script/script.go @@ -50,7 +50,7 @@ func CreateDockermiScript(scriptPath string, services DockermiTypes.ServiceScrip }) for _, service := range services { dockermiScript.WriteString(fmt.Sprintf(" echo \"Stopping %s...\"\n", service.ServiceName)) - dockermiScript.WriteString(fmt.Sprintf(" docker-compose -f \"%s\" down \"%s\" \"$@\"\n", service.ComposeFile, service.ServiceName)) + dockermiScript.WriteString(fmt.Sprintf(" docker-compose -f \"%s\" stop \"%s\" \"$@\"\n", service.ComposeFile, service.ServiceName)) bar.Add(1) time.Sleep(500 * time.Millisecond) // Simulate delay for demonstration } diff --git a/pkg/dockermi.go b/pkg/dockermi.go index cd26ec8..c41c7fb 100644 --- a/pkg/dockermi.go +++ b/pkg/dockermi.go @@ -17,7 +17,7 @@ import ( ) func GetVersion() string { - return "v0.1.5" + return "v0.1.6" } // RunDockermi executes the main logic of the dockermi command. It takes a @@ -55,7 +55,9 @@ func RunDockermi(projectDir string) (string, error) { case "up": return handleUpDownCommand(projectDir, "up", os.Args[2:]) case "down": - return handleUpDownCommand(projectDir, "down", os.Args[2:]) // Handle the down command + return handleUpDownCommand(projectDir, "down", os.Args[2:]) + case "stop": + return handleUpDownCommand(projectDir, "down", os.Args[2:]) case "create": if len(os.Args) < 3 { return "", fmt.Errorf("missing key for create command") diff --git a/test/withkeys2/docker-compose.yml b/test/withkeys1 copy/docker-compose.yml similarity index 100% rename from test/withkeys2/docker-compose.yml rename to test/withkeys1 copy/docker-compose.yml diff --git a/utils/utils.go b/utils/utils.go index e913a9a..9348429 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -7,7 +7,7 @@ import ( // DisplayHelp prints the usage information for the dockermi command to the console. func DisplayHelp(version string) { fmt.Printf(` -Dockermi version: %s +Dockermi version: %s | github.com/mkhuda/dockermi Usage: dockermi [command] [options] This command generates a dockermi.sh script to manage Docker services defined in docker-compose.yml files. @@ -16,16 +16,19 @@ and the 'dockermi.sh' script is created in the current directory where the 'dock Commands: create Generate a dockermi.sh script for the specified service key. - up [options] Start the Docker services defined in the dockermi.sh file in current directory. - down [options] Stop the Docker services defined in the dockermi.sh file in current directory. + up [options] Start the Docker services defined in the dockermi.sh file in the current directory. + down [options] Stop the Docker services defined in the dockermi.sh file in the current directory. Options: --help Display this help message and exit. --version Display current installed version. + --force Force create dockermi.sh from all valid docker-compose files, ignoring dockermi labels convention. Examples: dockermi # Generates a dockermi.sh script in the current directory. dockermi create myservicekey # [Experimental] Create a script for the specified service key. - dockermi up -d --build # Start services with the --build option. - dockermi down --remove-orphans # Stop services and remove orphan containers.`, version) + dockermi up -d --build # Start services with the --build option. + dockermi down --remove-orphans # Stop services and remove orphan containers. + +`, version) }