Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ let package = Package(
platforms: [.macOS(.v15)],
dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.1"),
.package(url: "https://github.com/mcrich23/container", branch: "add-command-option-group-function-macro"),
.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
.package(url: "https://github.com/apple/container", from: "1.0.0"),
.package(url: "https://github.com/jpsim/Yams.git", from: "6.0.0"),
.package(url: "https://github.com/onevcat/Rainbow", .upToNextMajor(from: "4.0.0")),
],
targets: [
Expand Down
2 changes: 1 addition & 1 deletion Sources/Container-Compose/Application.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import ArgumentParser

public struct Main: AsyncParsableCommand {
private static let commandName: String = "container-compose"
private static let version: String = "0.12.0"
private static let version: String = "1.0.0"
public static var versionString: String {
"\(commandName) version \(version)"
}
Expand Down
1 change: 0 additions & 1 deletion Sources/Container-Compose/Commands/ComposeUp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import ArgumentParser
import ContainerCommands
//import ContainerClient
import ContainerAPIClient
import ContainerizationExtras
import Foundation
Expand Down
14 changes: 14 additions & 0 deletions Sources/Container-Compose/Helper Functions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import Foundation
import Yams
import Rainbow
import ContainerCommands
import ContainerAPIClient

public func resolvedPath(for path: String, relativeTo baseURL: URL) -> String {
let expandedPath = NSString(string: path).expandingTildeInPath
Expand Down Expand Up @@ -232,3 +233,16 @@ public struct CommandResult {
extension NamedColor: @retroactive Codable {

}

extension Flags.Logging {
/// Generates an array of flags that allow us to pass down Logging options
func passThroughCommands() -> [String] {
var flags: [String] = []

if debug {
flags.append("--debug")
}

return flags
}
}
Loading
Loading