Merge branch 'main' into mazdak/container-compose

Author: mazdak

BUILDING.md

@@ -23,6 +23,13 @@ Copy the binaries to `/usr/local/bin` and `/usr/local/libexec` (requires enterin
 make install
 ```
 
+Or to install a release build, with better performance than the debug build:
+
+```bash
+BUILD_CONFIGURATION=release make all test integration
+BUILD_CONFIGURATION=release make install
+```
+
 ## Compile protobufs
 
 `container` uses gRPC to communicate to the builder virtual machine that creates images from `Dockerfile`s, and depends on specific versions of `grpc-swift` and `swift-protobuf`. If you make changes to the gRPC APIs in the [container-builder-shim](https://github.com/apple/container-builder-shim) project, install the tools and re-generate the gRPC code in this project using:

Makefile

@@ -138,6 +138,7 @@ integration: init-block
 	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLINetwork
 	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLIRunLifecycle
 	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLIExecCommand
+	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLICreateCommand
 	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLIRunCommand
 	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLIImagesCommand
 	@$(SWIFT) test -c $(BUILD_CONFIGURATION) --filter TestCLIRunBase

Package.resolved

@@ -22,7 +22,7 @@ import PackageDescription
 
 let releaseVersion = ProcessInfo.processInfo.environment["RELEASE_VERSION"] ?? "0.0.0"
 let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
-let scVersion = "0.4.1"
+let scVersion = "0.5.0"
 let builderShimVersion = "0.6.0"
 
 let package = Package(

Package.swift

@@ -64,4 +64,4 @@ Contributions to `container` are welcomed and encouraged. Please see our [main c
 
 ## Project Status
 
-The container project is currently under active development. Its stability, both for consuming the project as a Swift package and the `container` tool, is only guaranteed within minor versions, such as between 0.1.1 and 0.1.2. Minor version number releases may include breaking changes until we achieve a 1.0.0 release.
+The container project is currently under active development. Its stability, both for consuming the project as a Swift package and the `container` tool, is only guaranteed within patch versions, such as between 0.1.1 and 0.1.2. Minor version number releases may include breaking changes until we achieve a 1.0.0 release.

README.md

@@ -182,7 +182,7 @@ struct Application: AsyncParsableCommand {
                 return -1
             }
 
-            try await process.start(io.stdio)
+            try await process.start()
             defer {
                 try? io.close()
             }

Sources/CLI/Application.swift

@@ -245,10 +245,12 @@ extension ClientContainer {
                 detach: true
             )
             defer { try? io.close() }
-            let process = try await bootstrap()
-            _ = try await process.start(io.stdio)
+
+            let process = try await bootstrap(stdio: io.stdio)
+            _ = try await process.start()
             await taskManager?.finish()
             try io.closeAfterStart()
+
             log.debug("starting BuildKit and BuildKit-shim")
         } catch {
             try? await stop()

Sources/CLI/Builder/BuilderStart.swift

@@ -29,7 +29,7 @@ extension Application {
         @Argument(help: "Image name")
         var image: String
 
-        @Argument(help: "Container init process arguments")
+        @Argument(parsing: .captureForPassthrough, help: "Container init process arguments")
         var arguments: [String] = []
 
         @OptionGroup

Sources/CLI/Container/ContainerCreate.swift

@@ -81,7 +81,9 @@ extension Application {
 
                 let process = try await container.createProcess(
                     id: UUID().uuidString.lowercased(),
-                    configuration: config)
+                    configuration: config,
+                    stdio: io.stdio
+                )
 
                 exitCode = try await Application.handleProcess(io: io, process: process)
             } catch {

Sources/CLI/Container/ContainerExec.swift

@@ -51,19 +51,19 @@ extension Application {
             progress.start()
 
             let container = try await ClientContainer.get(id: containerID)
-            let process = try await container.bootstrap()
-
-            progress.set(description: "Starting init process")
-            let detach = !self.attach && !self.interactive
             do {
+                let detach = !self.attach && !self.interactive
                 let io = try ProcessIO.create(
                     tty: container.configuration.initProcess.terminal,
                     interactive: self.interactive,
                     detach: detach
                 )
+
+                let process = try await container.bootstrap(stdio: io.stdio)
                 progress.finish()
+
                 if detach {
-                    try await process.start(io.stdio)
+                    try await process.start()
                     defer {
                         try? io.close()
                     }