Updated API to account for changes in #603

Author: mazdak

Plugins/container-compose/Package.resolved

@@ -26,7 +26,7 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "container", path: "../.."), // Main container package
-        .package(url: "https://github.com/apple/containerization.git", exact: "0.6.2"),
+        .package(url: "https://github.com/apple/containerization.git", exact: "0.8.0"),
         .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.3.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
@@ -56,6 +56,7 @@ let package = Package(
                 .product(name: "ContainerizationOS", package: "containerization"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "ContainerClient", package: "container"),
+                .product(name: "ContainerCommands", package: "container"),
             ],
             path: "Sources/Core"
         ),

Plugins/container-compose/Package.swift

@@ -31,7 +31,7 @@ struct ComposeDown: AsyncParsableCommand {
     var composeOptions: ComposeOptions
 
     @OptionGroup
-    var global: Flags.Global
+    var global: ComposeGlobalOptions
 
         @Flag(name: .long, help: "Remove named volumes declared in the volumes section")
         var volumes: Bool = false
@@ -40,6 +40,7 @@ struct ComposeDown: AsyncParsableCommand {
         var removeOrphans: Bool = false
 
         func run() async throws {
+        global.configureLogging()
         // Set environment variables
         composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()

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

@@ -30,7 +30,7 @@ struct ComposeExec: AsyncParsableCommand {
     var composeOptions: ComposeOptions
 
     @OptionGroup
-    var global: Flags.Global
+    var global: ComposeGlobalOptions
 
         @Flag(name: [.customLong("detach"), .customShort("d")], help: "Run command in the background")
         var detach: Bool = false
@@ -57,6 +57,7 @@ struct ComposeExec: AsyncParsableCommand {
         var command: [String] = []
 
         func run() async throws {
+        global.configureLogging()
         // Load .env and set environment variables
         composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()

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

@@ -32,7 +32,7 @@ struct ComposeHealth: AsyncParsableCommand {
 
     @OptionGroup var composeOptions: ComposeOptions
 
-    @OptionGroup var global: Flags.Global
+    @OptionGroup var global: ComposeGlobalOptions
 
     @Argument(help: "Services to check (omit to check all)")
     var services: [String] = []
@@ -41,6 +41,7 @@ struct ComposeHealth: AsyncParsableCommand {
     var quiet: Bool = false
 
     func run() async throws {
+        global.configureLogging()
 
         // Set environment variables
         composeOptions.setEnvironmentVariables()

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

@@ -30,7 +30,7 @@ struct ComposeLogs: AsyncParsableCommand {
     var composeOptions: ComposeOptions
 
     @OptionGroup
-    var global: Flags.Global
+    var global: ComposeGlobalOptions
 
         @Flag(name: .long, help: "Follow log output")
         var follow: Bool = false
@@ -54,6 +54,7 @@ struct ComposeLogs: AsyncParsableCommand {
         var services: [String] = []
 
         func run() async throws {
+        global.configureLogging()
         // Load .env and set environment variables
         composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()

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

@@ -30,7 +30,7 @@ struct ComposePS: AsyncParsableCommand {
     var composeOptions: ComposeOptions
 
     @OptionGroup
-    var global: Flags.Global
+    var global: ComposeGlobalOptions
 
         @Flag(name: [.customLong("all"), .customShort("a")], help: "Show all containers (default shows just running)")
         var all: Bool = false
@@ -39,6 +39,7 @@ struct ComposePS: AsyncParsableCommand {
         var quiet: Bool = false
 
         func run() async throws {
+        global.configureLogging()
         // Load .env and set environment variables
         composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()

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

@@ -20,14 +20,24 @@ import Foundation
 import ContainerLog
 import Logging
 
-// Import Flags namespace from main container CLI
-struct Flags {
-    struct Global: ParsableArguments {
-        @Flag(name: .shortAndLong, help: "Enable debug logging")
-        var debug = false
+struct ComposeGlobalOptions: ParsableArguments {
+    @OptionGroup
+    var shared: Flags.Global
 
-        @Flag(name: .long, help: "Allow YAML anchors and merge keys in compose files")
-        var allowAnchors = false
+    @Flag(name: .long, help: "Allow YAML anchors and merge keys in compose files")
+    var allowAnchors = false
+
+    var debug: Bool {
+        shared.debug
+    }
+
+    func configureLogging() {
+        let debugEnvVar = ProcessInfo.processInfo.environment["CONTAINER_DEBUG"]
+        if debug || debugEnvVar != nil {
+            log.logLevel = .debug
+        } else {
+            log.logLevel = .info
+        }
     }
 }
 

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

@@ -30,7 +30,7 @@ struct ComposeRestart: AsyncParsableCommand {
     var composeOptions: ComposeOptions
 
     @OptionGroup
-    var global: Flags.Global
+    var global: ComposeGlobalOptions
 
     @Option(name: [.customLong("timeout"), .customShort("t")], help: "Specify a shutdown timeout in seconds (default: 10)")
     var timeout: Int = 10
@@ -42,6 +42,7 @@ struct ComposeRestart: AsyncParsableCommand {
     var noHealthcheck: Bool = false
 
         func run() async throws {
+        global.configureLogging()
         // Set environment variables
         composeOptions.setEnvironmentVariables()
 

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

@@ -31,7 +31,7 @@ struct ComposeRm: AsyncParsableCommand {
     var composeOptions: ComposeOptions
 
     @OptionGroup
-    var global: Flags.Global
+    var global: ComposeGlobalOptions
 
     @Flag(name: .long, help: "Force removal of running containers")
     var force: Bool = false
@@ -40,6 +40,7 @@ struct ComposeRm: AsyncParsableCommand {
     var services: [String] = []
 
     func run() async throws {
+        global.configureLogging()
         // Set environment variables
         composeOptions.loadDotEnvIfPresent()
         composeOptions.setEnvironmentVariables()