Add Compose

Makefile

@@ -21,7 +21,7 @@ export GIT_COMMIT := $(shell git rev-parse HEAD)
 SWIFT := "/usr/bin/swift"
 DESTDIR ?= /usr/local/
 ROOT_DIR := $(shell git rev-parse --show-toplevel)
-BUILD_BIN_DIR = $(shell $(SWIFT) build -c $(BUILD_CONFIGURATION) --show-bin-path)
+BUILD_BIN_DIR := .build/$(BUILD_CONFIGURATION)
 STAGING_DIR := bin/$(BUILD_CONFIGURATION)/staging/
 PKG_PATH := bin/$(BUILD_CONFIGURATION)/container-installer-unsigned.pkg
 DSYM_DIR := bin/$(BUILD_CONFIGURATION)/bundle/container-dSYM
@@ -44,7 +44,7 @@ SUDO ?= sudo
 include Protobuf.Makefile
 
 .PHONY: all
-all: container
+all: container compose
 all: init-block
 
 .PHONY: build
@@ -57,6 +57,10 @@ build:
 container: build
 	@"$(MAKE)" BUILD_CONFIGURATION=$(BUILD_CONFIGURATION) DESTDIR="$(ROOT_DIR)/" SUDO= install
 
+.PHONY: compose
+compose: build
+	@"$(MAKE)" BUILD_CONFIGURATION=$(BUILD_CONFIGURATION) DESTDIR=$(ROOT_DIR)/ SUDO= install-compose
+
 .PHONY: release
 release: BUILD_CONFIGURATION = release
 release: all
@@ -110,6 +114,31 @@ installer-pkg: $(STAGING_DIR)
 	@pkgbuild --root "$(STAGING_DIR)" --identifier com.apple.container-installer --install-location /usr/local --version ${RELEASE_VERSION} $(PKG_PATH)
 	@rm -rf "$(STAGING_DIR)"
 
+################################################################################
+# Compose plugin install targets
+################################################################################
+
+COMPOSE_STAGING_DIR := bin/$(BUILD_CONFIGURATION)/compose-staging/
+
+.PHONY: install-compose
+install-compose: compose-staging
+	@echo Installing compose plugin to $(DESTDIR)...
+	@$(SUDO) mkdir -p $(DESTDIR)/libexec/container/plugins/compose/bin
+	@$(SUDO) install $(BUILD_BIN_DIR)/compose $(DESTDIR)/libexec/container/plugins/compose/bin/compose
+	@$(SUDO) install config/compose-config.json $(DESTDIR)/libexec/container/plugins/compose/config.json
+	@$(SUDO) install scripts/uninstall-compose.sh $(DESTDIR)/libexec/container/plugins/compose/bin/uninstall-compose.sh
+	@$(SUDO) codesign $(CODESIGN_OPTS) $(DESTDIR)/libexec/container/plugins/compose/bin/compose
+
+compose-staging:
+	@echo Staging compose plugin binaries to $(COMPOSE_STAGING_DIR)...
+	@rm -rf $(COMPOSE_STAGING_DIR)
+	@mkdir -p $(COMPOSE_STAGING_DIR)/libexec/container/plugins/compose/bin
+	@install $(BUILD_BIN_DIR)/container $(COMPOSE_STAGING_DIR)/libexec/container/plugins/compose/bin/compose
+	@install config/compose-config.json $(COMPOSE_STAGING_DIR)/libexec/container/plugins/compose/config.json
+	@install scripts/uninstall-compose.sh $(COMPOSE_STAGING_DIR)/libexec/container/plugins/compose/bin/uninstall-compose.sh
+
+################################################################################
+
 .PHONY: dsym
 dsym:
 	@echo Copying debug symbols...

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"]),
@@ -46,6 +47,7 @@ let package = Package(
         .library(name: "ContainerBuildCache", targets: ["ContainerBuildCache"]),
         .library(name: "ContainerBuildSnapshotter", targets: ["ContainerBuildSnapshotter"]),
         .library(name: "ContainerBuildParser", targets: ["ContainerBuildParser"]),
+        .library(name: "ComposeCLI", targets: ["ComposeCLI"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
@@ -59,11 +61,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"),
@@ -432,5 +445,27 @@ let package = Package(
                 .define("BUILDER_SHIM_VERSION", to: "\"\(builderShimVersion)\""),
             ]
         ),
+
+        // MARK: Plugins
+        .target(
+            name: "ComposeCLI",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                "container",
+                "ContainerCLI",
+                "Yams",
+                "Rainbow",
+            ],
+            path: "Plugins/Compose/ComposeCLI"
+        ),
+
+        .executableTarget(
+            name: "compose",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                "ComposeCLI"
+            ],
+            path: "Plugins/Compose/compose"
+        ),
     ]
 )

Plugins/Compose/ComposeCLI/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/ComposeCLI/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/ComposeCLI/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/ComposeCLI/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/ComposeCLI/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?
+}