Add Compose

Makefile

@@ -68,7 +68,13 @@ install: installer-pkg
 		rm -rf $${temp_dir} ; \
 	else \
 		$(SUDO) installer -pkg $(PKG_PATH) -target / ; \
-	fi 
+	fi
+
+	@echo Installing compose into $(DESTDIR)...
+	@$(SUDO) mkdir -p $(join $(DESTDIR), libexec/container-plugins/compose/bin)
+	@$(SUDO) install $(BUILD_BIN_DIR)/compose $(join $(DESTDIR), libexec/container-plugins/compose/bin/compose)
+	@$(SUDO) install config/compose-config.json $(join $(DESTDIR), libexec/container-plugins/compose/config.json)
+	@$(SUDO) codesign $(CODESIGN_OPTS) $(join $(DESTDIR), libexec/container-plugins/compose/bin/compose)
 
 $(STAGING_DIR): 
 	@echo Installing container binaries from $(BUILD_BIN_DIR) into $(STAGING_DIR)...

Package.swift

@@ -33,6 +33,7 @@ let package = Package(
         .library(name: "ContainerNetworkService", targets: ["ContainerNetworkService"]),
         .library(name: "ContainerImagesService", targets: ["ContainerImagesService", "ContainerImagesServiceClient"]),
         .library(name: "ContainerClient", targets: ["ContainerClient"]),
+        .library(name: "ContainerCLI", targets: ["ContainerCLI"]),
         .library(name: "ContainerBuild", targets: ["ContainerBuild"]),
         .library(name: "ContainerLog", targets: ["ContainerLog"]),
         .library(name: "ContainerPersistence", targets: ["ContainerPersistence"]),
@@ -49,11 +50,22 @@ let package = Package(
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.20.1"),
         .package(url: "https://github.com/orlandos-nl/DNSClient.git", from: "2.4.1"),
         .package(url: "https://github.com/Bouke/DNS.git", from: "1.2.0"),
+        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
+        .package(url: "https://github.com/onevcat/Rainbow", .upToNextMajor(from: "4.0.0")),
         .package(url: "https://github.com/apple/containerization.git", exact: Version(stringLiteral: scVersion)),
     ],
     targets: [
         .executableTarget(
             name: "container",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                "ContainerClient",
+                "ContainerCLI",
+            ],
+            path: "Sources/ExecutableCLI"
+        ),
+        .target(
+            name: "ContainerCLI",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "Logging", package: "swift-log"),
@@ -307,5 +319,17 @@ let package = Package(
                 .define("BUILDER_SHIM_VERSION", to: "\"\(builderShimVersion)\""),
             ]
         ),
+
+        // MARK: Plugins
+        .executableTarget(
+            name: "compose",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                "container",
+                "Yams",
+                "Rainbow",
+            ],
+            path: "Plugins/compose"
+        )
     ]
 )

Plugins/compose/Codable Structs/Build.swift

@@ -0,0 +1,52 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+//
+//  Build.swift
+//  container-compose-app
+//
+//  Created by Morris Richman on 6/17/25.
+//
+
+
+/// Represents the `build` configuration for a service.
+struct Build: Codable, Hashable {
+    /// Path to the build context
+    let context: String
+    /// Optional path to the Dockerfile within the context
+    let dockerfile: String?
+    /// Build arguments
+    let args: [String: String]?
+
+    /// Custom initializer to handle `build: .` (string) or `build: { context: . }` (object)
+    init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        if let contextString = try? container.decode(String.self) {
+            self.context = contextString
+            self.dockerfile = nil
+            self.args = nil
+        } else {
+            let keyedContainer = try decoder.container(keyedBy: CodingKeys.self)
+            self.context = try keyedContainer.decode(String.self, forKey: .context)
+            self.dockerfile = try keyedContainer.decodeIfPresent(String.self, forKey: .dockerfile)
+            self.args = try keyedContainer.decodeIfPresent([String: String].self, forKey: .args)
+        }
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case context, dockerfile, args
+    }
+}

Plugins/compose/Codable Structs/Config.swift

@@ -0,0 +1,55 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+//
+//  Config.swift
+//  container-compose-app
+//
+//  Created by Morris Richman on 6/17/25.
+//
+
+
+/// Represents a top-level config definition (primarily for Swarm).
+struct Config: Codable {
+    /// Path to the file containing the config content
+    let file: String?
+    /// Indicates if the config is external (pre-existing)
+    let external: ExternalConfig?
+    /// Explicit name for the config
+    let name: String?
+    /// Labels for the config
+    let labels: [String: String]?
+
+    enum CodingKeys: String, CodingKey {
+        case file, external, name, labels
+    }
+
+    /// Custom initializer to handle `external: true` (boolean) or `external: { name: "my_cfg" }` (object).
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        file = try container.decodeIfPresent(String.self, forKey: .file)
+        name = try container.decodeIfPresent(String.self, forKey: .name)
+        labels = try container.decodeIfPresent([String: String].self, forKey: .labels)
+
+        if let externalBool = try? container.decodeIfPresent(Bool.self, forKey: .external) {
+            external = ExternalConfig(isExternal: externalBool, name: nil)
+        } else if let externalDict = try? container.decodeIfPresent([String: String].self, forKey: .external) {
+            external = ExternalConfig(isExternal: true, name: externalDict["name"])
+        } else {
+            external = nil
+        }
+    }
+}

Plugins/compose/Codable Structs/Deploy.swift

@@ -0,0 +1,35 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+//
+//  Deploy.swift
+//  container-compose-app
+//
+//  Created by Morris Richman on 6/17/25.
+//
+
+
+/// Represents the `deploy` configuration for a service (primarily for Swarm orchestration).
+struct Deploy: Codable, Hashable {
+    /// Deployment mode (e.g., 'replicated', 'global')
+    let mode: String?
+    /// Number of replicated service tasks
+    let replicas: Int?
+    /// Resource constraints (limits, reservations)
+    let resources: DeployResources?
+    /// Restart policy for tasks
+    let restart_policy: DeployRestartPolicy?
+}

Plugins/compose/Codable Structs/DeployResources.swift

@@ -0,0 +1,31 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+//
+//  DeployResources.swift
+//  container-compose-app
+//
+//  Created by Morris Richman on 6/17/25.
+//
+
+
+/// Resource constraints for deployment.
+struct DeployResources: Codable, Hashable {
+    /// Hard limits on resources
+    let limits: ResourceLimits?
+    /// Guarantees for resources
+    let reservations: ResourceReservations?
+}

Plugins/compose/Codable Structs/DeployRestartPolicy.swift

@@ -0,0 +1,35 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+//
+//  DeployRestartPolicy.swift
+//  container-compose-app
+//
+//  Created by Morris Richman on 6/17/25.
+//
+
+
+/// Restart policy for deployed tasks.
+struct DeployRestartPolicy: Codable, Hashable {
+    /// Condition to restart on (e.g., 'on-failure', 'any')
+    let condition: String?
+    /// Delay before attempting restart
+    let delay: String?
+    /// Maximum number of restart attempts
+    let max_attempts: Int?
+    /// Window to evaluate restart policy
+    let window: String?
+}

Plugins/compose/Codable Structs/DeviceReservation.swift

@@ -0,0 +1,35 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+//
+//  DeviceReservation.swift
+//  container-compose-app
+//
+//  Created by Morris Richman on 6/17/25.
+//
+
+
+/// Device reservations for GPUs or other devices.
+struct DeviceReservation: Codable, Hashable {
+    /// Device capabilities
+    let capabilities: [String]?
+    /// Device driver
+    let driver: String?
+    /// Number of devices
+    let count: String?
+    /// Specific device IDs
+    let device_ids: [String]?
+}