Increased compatibility with docker-compose "depends_on" function

Author: mazdak

Plugins/container-compose/Package.swift

@@ -61,10 +61,11 @@ let package = Package(
             name: "ComposeTests",
             dependencies: [
                 "ComposeCore",
+                "ComposePlugin",
                 .product(name: "Containerization", package: "containerization"),
                 .product(name: "Logging", package: "swift-log"),
             ],
             path: "Tests/ComposeTests"
         ),
     ]
-)
+)

Plugins/container-compose/Sources/CLI/ComposeCommand.swift

@@ -47,39 +47,47 @@ struct ComposeOptions: ParsableArguments {
     }
 
     func getComposeFileURLs() -> [URL] {
-        // If no files specified, use default
-        let files = file.isEmpty ? ["docker-compose.yaml", "docker-compose.yml", "compose.yaml", "compose.yml"] : file
-        
-        var urls: [URL] = []
         let currentPath = FileManager.default.currentDirectoryPath
 
-        for fileName in files {
-            let url: URL
-            if fileName.hasPrefix("/") {
-                url = URL(fileURLWithPath: fileName)
-            } else {
-                url = URL(fileURLWithPath: currentPath).appendingPathComponent(fileName)
-            }
-            
-            // For default files, only add if they exist
-            if file.isEmpty {
-                if FileManager.default.fileExists(atPath: url.path) {
-                    urls.append(url)
-                    break // Use first found default file
-                }
-            } else {
-                // For explicitly specified files, add them all (parser will check existence)
-                urls.append(url)
+        // If files were explicitly specified, return all of them (relative to cwd)
+        if !file.isEmpty {
+            return file.map { name in
+                if name.hasPrefix("/") { return URL(fileURLWithPath: name) }
+                return URL(fileURLWithPath: currentPath).appendingPathComponent(name)
             }
         }
 
-        // If no files found from defaults, return the first default for error message
-        if urls.isEmpty && file.isEmpty {
-            let defaultFile = URL(fileURLWithPath: currentPath).appendingPathComponent("docker-compose.yaml")
-            urls.append(defaultFile)
+        // Default behavior: detect base compose file and include matching override
+        let candidates = [
+            "docker-compose.yml",
+            "docker-compose.yaml",
+            "compose.yml",
+            "compose.yaml",
+        ]
+        
+        for base in candidates {
+            let baseURL = URL(fileURLWithPath: currentPath).appendingPathComponent(base)
+            if FileManager.default.fileExists(atPath: baseURL.path) {
+                var urls = [baseURL]
+                // Include override for the chosen base
+                let overrideCandidates: [String]
+                if base.hasPrefix("docker-compose") {
+                    overrideCandidates = ["docker-compose.override.yml", "docker-compose.override.yaml"]
+                } else {
+                    overrideCandidates = ["compose.override.yml", "compose.override.yaml"]
+                }
+                for o in overrideCandidates {
+                    let oURL = URL(fileURLWithPath: currentPath).appendingPathComponent(o)
+                    if FileManager.default.fileExists(atPath: oURL.path) {
+                        urls.append(oURL)
+                    }
+                }
+                return urls
+            }
         }
 
-        return urls
+        // Nothing found: return a sensible default path for better error message downstream
+        return [URL(fileURLWithPath: currentPath).appendingPathComponent("docker-compose.yml")]
     }
 
     func setEnvironmentVariables() {
@@ -90,4 +98,28 @@ struct ComposeOptions: ParsableArguments {
             }
         }
     }
+
+    /// Load .env from current working directory and export vars into process env
+    /// Compose uses .env for interpolation; we approximate by exporting to env before parsing
+    func loadDotEnvIfPresent() {
+        let cwd = FileManager.default.currentDirectoryPath
+        let dotEnvURL = URL(fileURLWithPath: cwd).appendingPathComponent(".env")
+        guard FileManager.default.fileExists(atPath: dotEnvURL.path) else { return }
+        if let contents = try? String(contentsOf: dotEnvURL, encoding: .utf8) {
+            for line in contents.split(whereSeparator: { $0.isNewline }) {
+                var s = String(line).trimmingCharacters(in: .whitespaces)
+                if s.isEmpty || s.hasPrefix("#") { continue }
+                if s.hasPrefix("export ") { s.removeFirst("export ".count) }
+                let parts = s.split(separator: "=", maxSplits: 1)
+                if parts.count == 2 {
+                    let key = String(parts[0]).trimmingCharacters(in: .whitespaces)
+                    var val = String(parts[1]).trimmingCharacters(in: .whitespaces)
+                    if (val.hasPrefix("\"") && val.hasSuffix("\"")) || (val.hasPrefix("'") && val.hasSuffix("'")) {
+                        val = String(val.dropFirst().dropLast())
+                    }
+                    setenv(key, val, 1) // override to ensure deterministic interpolation in this process
+                }
+            }
+        }
+    }
 }

Plugins/container-compose/Sources/CLI/ComposeDown.swift

@@ -41,6 +41,7 @@ struct ComposeDown: AsyncParsableCommand {
 
         func run() async throws {
         // Set environment variables
+        composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()
 
         // Parse compose file
@@ -73,6 +74,7 @@ struct ComposeDown: AsyncParsableCommand {
         try await orchestrator.down(
             project: project,
             removeVolumes: volumes,
+            removeOrphans: removeOrphans,
             progressHandler: progress.handler
         )
 

Plugins/container-compose/Sources/CLI/ComposeUp.swift

@@ -53,6 +53,7 @@ struct ComposeUp: AsyncParsableCommand {
 
     func run() async throws {
         // Set environment variables
+        composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()
 
         // Parse compose files
@@ -88,13 +89,43 @@ struct ComposeUp: AsyncParsableCommand {
             detach: detach,
             forceRecreate: forceRecreate,
             noRecreate: noRecreate,
+            noDeps: noDeps,
+            removeOrphans: removeOrphans,
             progressHandler: progress.handler
         )
 
         progress.finish()
 
+        // Call out DNS names for service discovery inside the container network
+        if !project.services.isEmpty {
+            print("Service DNS names:")
+            for (name, svc) in project.services.sorted(by: { $0.key < $1.key }) {
+                let cname = svc.containerName ?? "\(project.name)_\(name)"
+                print("- \(name): \(cname)")
+            }
+        }
+        
         if detach {
             print("Started project '\(project.name)' in detached mode")
+        } else {
+            // Stream logs for selected services (or all if none selected), similar to docker-compose up
+            let orchestrator = Orchestrator(log: log)
+            let logStream = try await orchestrator.logs(
+                project: project,
+                services: services,
+                follow: true,
+                tail: nil,
+                timestamps: false
+            )
+            for try await entry in logStream {
+                let output = "[\(entry.serviceName)] \(entry.message)"
+                switch entry.stream {
+                case .stdout:
+                    print(output)
+                case .stderr:
+                    FileHandle.standardError.write(Data((output + "\n").utf8))
+                }
+            }
         }
     }
 }

Plugins/container-compose/Sources/Core/Models/Project.swift

@@ -46,6 +46,9 @@ public struct Service: Sendable {
     public let volumes: [VolumeMount]
     public let networks: [String]
     public let dependsOn: [String]
+    public let dependsOnHealthy: [String]
+    public let dependsOnStarted: [String]
+    public let dependsOnCompletedSuccessfully: [String]
     public let healthCheck: HealthCheck?
     public let deploy: Deploy?
     public let restart: String?
@@ -67,6 +70,9 @@ public struct Service: Sendable {
                 volumes: [VolumeMount] = [],
                 networks: [String] = [],
                 dependsOn: [String] = [],
+                dependsOnHealthy: [String] = [],
+                dependsOnStarted: [String] = [],
+                dependsOnCompletedSuccessfully: [String] = [],
                 healthCheck: HealthCheck? = nil,
                 deploy: Deploy? = nil,
                 restart: String? = nil,
@@ -85,6 +91,9 @@ public struct Service: Sendable {
         self.volumes = volumes
         self.networks = networks
         self.dependsOn = dependsOn
+        self.dependsOnHealthy = dependsOnHealthy
+        self.dependsOnStarted = dependsOnStarted
+        self.dependsOnCompletedSuccessfully = dependsOnCompletedSuccessfully
         self.healthCheck = healthCheck
         self.deploy = deploy
         self.restart = restart
@@ -145,6 +154,10 @@ public struct PortMapping: Sendable {
         default:
             return nil
         }
+        // Validate numeric ports
+        guard let host = Int(self.hostPort), let container = Int(self.containerPort), host > 0, container > 0, host <= 65535, container <= 65535 else {
+            return nil
+        }
     }
 }
 
@@ -283,4 +296,4 @@ public struct Volume: Sendable {
         self.driver = driver
         self.external = external
     }
-}
+}