Merge pull request #92 from MZC-CSC/develop

feat: enhance Docker infrastructure commands with improved service management

Author: MZC-CSC

cmd/docker/info.go

@@ -3,9 +3,13 @@ package docker
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
+	"regexp"
+
 	"github.com/cm-mayfly/cm-mayfly/common"
 	"github.com/spf13/cobra"
 )
@@ -143,7 +147,8 @@ func showHumanReadableInfo() {
 			info.Healthy = "-"
 			info.InternalPort = "-"
 			info.ExternalPort = "-"
-			info.Version = "-"
+			// For non-running services, get version from docker-compose.yaml
+			info.Version = getVersionFromComposeFile(service)
 		}
 
 		// Get image size - prioritize running container's image
@@ -177,6 +182,7 @@ type ContainerInfo struct {
 	InternalPort string
 	ExternalPort string
 	Version      string
+	Image        string
 }
 
 // ImageInfo represents image information
@@ -242,6 +248,7 @@ func getContainerInfo(showAll bool) map[string]ContainerInfo {
 			Status  string `json:"Status"`
 			Health  string `json:"Health"`
 			Ports   string `json:"Ports"`
+			Image   string `json:"Image"`
 		}
 
 		if err := json.Unmarshal([]byte(line), &container); err != nil {
@@ -271,8 +278,11 @@ func getContainerInfo(showAll bool) map[string]ContainerInfo {
 			}
 		}
 
-		// Extract version from image name if possible
-		version := getVersionFromService(container.Service)
+		// Extract version from image tag if available, otherwise use fallback
+		version := extractVersionFromImage(container.Image)
+		if version == "" {
+			version = getVersionFromService(container.Service)
+		}
 
 		// Normalize status display
 		status := container.State
@@ -286,12 +296,28 @@ func getContainerInfo(showAll bool) map[string]ContainerInfo {
 			InternalPort: internalPort,
 			ExternalPort: externalPort,
 			Version:      version,
+			Image:        container.Image,
 		}
 	}
 
 	return containers
 }
 
+// extractVersionFromImage extracts version/tag from image name
+func extractVersionFromImage(imageName string) string {
+	if imageName == "" {
+		return ""
+	}
+
+	// Split by colon to get tag part
+	parts := strings.Split(imageName, ":")
+	if len(parts) > 1 {
+		return parts[len(parts)-1]
+	}
+
+	return ""
+}
+
 // getImageInfo gets image information using docker images
 func getImageInfo() map[string]ImageInfo {
 	images := make(map[string]ImageInfo)
@@ -382,6 +408,114 @@ func getServiceImageMapping() map[string]string {
 	}
 }
 
+// getVersionFromComposeFile reads docker-compose.yaml and returns version for non-running services
+func getVersionFromComposeFile(serviceName string) string {
+	// Read docker-compose.yaml file
+	composeFile := fmt.Sprintf("%s/docker-compose.yaml", filepath.Dir(DockerFilePath))
+	content, err := os.ReadFile(composeFile)
+	if err != nil {
+		return "-"
+	}
+
+	// Use regex to find the service and its image
+	// Pattern: serviceName: at the beginning of a line (with minimal indentation)
+	servicePattern := fmt.Sprintf(`^\s*%s:\s*$`, serviceName)
+	imagePattern := `^\s*image:\s*(.+)$`
+
+	serviceRegex, err := regexp.Compile(servicePattern)
+	if err != nil {
+		return "-"
+	}
+
+	imageRegex, err := regexp.Compile(imagePattern)
+	if err != nil {
+		return "-"
+	}
+
+	lines := strings.Split(string(content), "\n")
+	inService := false
+	indentLevel := 0
+
+	for i, line := range lines {
+		// Check if we're entering the service section
+		if serviceRegex.MatchString(line) {
+			// Check if this is a top-level service (not inside depends_on or other sections)
+			// by checking if the line starts with minimal indentation and is not inside depends_on
+			trimmedLine := strings.TrimLeft(line, " \t")
+			if strings.HasPrefix(trimmedLine, serviceName+":") {
+				// Check if we're not inside depends_on section by looking at previous lines
+				isInDependsOn := false
+				for j := i - 1; j >= 0 && j >= i-10; j-- {
+					prevLine := strings.TrimSpace(lines[j])
+					if prevLine == "depends_on:" {
+						isInDependsOn = true
+						break
+					}
+					if prevLine != "" && !strings.HasPrefix(lines[j], " ") && !strings.HasPrefix(lines[j], "\t") {
+						break
+					}
+				}
+
+				if !isInDependsOn {
+					inService = true
+					// Calculate the indentation level of the service
+					indentLevel = len(line) - len(strings.TrimLeft(line, " \t"))
+					continue
+				}
+			}
+		}
+
+		// If we're in the service section, look for image field
+		if inService {
+			currentIndent := len(line) - len(strings.TrimLeft(line, " \t"))
+
+			// Check if we've moved to another service or section (same or less indentation)
+			if strings.TrimSpace(line) != "" && currentIndent <= indentLevel && !strings.HasPrefix(line, " ") && !strings.HasPrefix(line, "\t") {
+				// We've moved to another service or section
+				break
+			}
+
+			// Look for image field
+			if matches := imageRegex.FindStringSubmatch(line); matches != nil {
+				image := strings.TrimSpace(matches[1])
+
+				// Extract version from image
+				version := extractVersionFromImage(image)
+				if version == "" {
+					return "-"
+				}
+
+				// Check if image exists locally
+				if !checkImageExists(image) {
+					return version + " (Not Downloaded)"
+				}
+
+				return version
+			}
+		}
+	}
+
+	return "-"
+}
+
+// checkImageExists checks if the specified image exists locally
+func checkImageExists(imageName string) bool {
+	cmd := exec.Command("docker", "images", "--format", "{{.Repository}}:{{.Tag}}", imageName)
+	output, err := cmd.Output()
+	if err != nil {
+		return false
+	}
+
+	// Check if the image exists in the output
+	lines := strings.Split(strings.TrimSpace(string(output)), "\n")
+	for _, line := range lines {
+		if strings.TrimSpace(line) == imageName {
+			return true
+		}
+	}
+	return false
+}
+
 // getVersionFromService gets version information from docker-compose.yaml for a specific service
 func getVersionFromService(serviceName string) string {
 	// Service to version mapping based on docker-compose.yaml
@@ -397,10 +531,10 @@ func getVersionFromService(serviceName string) string {
 		"cm-butterfly-db":       "14-alpine",
 		"cm-honeybee":           "0.3.6",
 		"cm-damselfly":          "0.3.6",
-		"cm-cicada":             "0.3.5",
+		"cm-cicada":             "0.3.6", // Updated to match actual running version
 		"airflow-redis":         "7.2-alpine",
 		"airflow-mysql":         "8.0-debian",
-		"airflow-server":        "0.3.5",
+		"airflow-server":        "0.3.6", // Updated to match actual running version
 		"cm-grasshopper":        "0.3.5",
 		"cm-ant":                "0.4.0",
 		"ant-postgres":          "latest-pg16",

cmd/docker/remove.go

@@ -32,17 +32,17 @@ var removeCmd = &cobra.Command{
 			removeOptions = ""
 		}
 
-		// 삭제 대상 정보 표시
+		// Display removal target information
 		fmt.Println("Removal Target:")
 
-		// 서비스 대상 표시
+		// Display service target
 		if ServiceName == "" {
 			fmt.Println("  Services: All services")
 		} else {
 			fmt.Printf("  Services: %s\n", ServiceName)
 		}
 
-		// 삭제 범위 표시
+		// Display removal scope
 		if allFlag {
 			fmt.Println("  Scope: Containers + Images + Volumes (all)")
 		} else if volFlag && imgFlag {
@@ -56,7 +56,7 @@ var removeCmd = &cobra.Command{
 		}
 		fmt.Println()
 
-		// 추가 옵션 안내
+		// Display additional options information
 		if !imgFlag && !volFlag && !allFlag {
 			fmt.Println("Additional Options:")
 			fmt.Println("  -i, --images    : Also remove images")
@@ -68,7 +68,7 @@ var removeCmd = &cobra.Command{
 			fmt.Println()
 		}
 
-		// 사용자 확인 요청
+		// Request user confirmation
 		fmt.Print("Do you want to proceed with the removal? (y/N): ")
 		reader := bufio.NewReader(os.Stdin)
 		response, _ := reader.ReadString('\n')
@@ -80,7 +80,41 @@ var removeCmd = &cobra.Command{
 		}
 
 		convertedServiceName := convertServiceNameForDockerCompose(ServiceName)
-		cmdStr = fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s down %s %s", ProjectName, DockerFilePath, removeOptions, convertedServiceName)
+
+		if ServiceName == "" {
+			// Remove entire system
+			cmdStr = fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s down %s", ProjectName, DockerFilePath, removeOptions)
+		} else {
+			// Remove specific service only
+			// 1. First stop the service
+			stopCmdStr := fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s stop %s", ProjectName, DockerFilePath, convertedServiceName)
+			common.SysCall(stopCmdStr)
+
+			// 2. Remove service (apply image/volume options)
+			if volFlag && imgFlag || allFlag {
+				// Remove volumes and images together
+				cmdStr = fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s rm -f -v %s", ProjectName, DockerFilePath, convertedServiceName)
+				common.SysCall(cmdStr)
+				// Image removal (direct removal using docker images command)
+				// Note: Removing images for specific services is complex,
+				// so it's safer to guide users to manual removal
+				fmt.Printf("⚠️  Note: Image removal for specific services is complex.\n")
+				fmt.Printf("   To remove images manually, use: docker images | grep %s\n", convertedServiceName)
+			} else if volFlag {
+				// Remove volumes only
+				cmdStr = fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s rm -f -v %s", ProjectName, DockerFilePath, convertedServiceName)
+			} else if imgFlag {
+				// Remove images only
+				cmdStr = fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s rm -f %s", ProjectName, DockerFilePath, convertedServiceName)
+				common.SysCall(cmdStr)
+				// Image removal guidance
+				fmt.Printf("⚠️  Note: Image removal for specific services is complex.\n")
+				fmt.Printf("   To remove images manually, use: docker images | grep %s\n", convertedServiceName)
+			} else {
+				// Remove containers only
+				cmdStr = fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s rm -f %s", ProjectName, DockerFilePath, convertedServiceName)
+			}
+		}
 
 		//fmt.Println(cmdStr)
 		common.SysCall(cmdStr)

conf/docker/tool/mayfly

@@ -3,16 +3,17 @@ module github.com/cm-mayfly/cm-mayfly
 go 1.19
 
 require (
+	github.com/go-sql-driver/mysql v1.8.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.10.1
-	golang.org/x/term v0.13.0
+	github.com/tidwall/gjson v1.17.1
+	golang.org/x/term v0.18.0
 )
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
@@ -24,7 +25,6 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/tidwall/gjson v1.17.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	golang.org/x/net v0.23.0 // indirect

go.mod

@@ -348,8 +348,9 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=