Skip to content

Package.swift, containertool: Make multi-line definitions clearer #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

Package.swift, containertool: Make multi-line definitions clearer #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ let package = Package(
.executableTarget(
name: "containertool",
dependencies: [
.target(name: "ContainerRegistry"), .target(name: "VendorCNIOExtrasZlib"), .target(name: "Tar"),
.target(name: "ContainerRegistry"),
.target(name: "VendorCNIOExtrasZlib"),
.target(name: "Tar"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
],
swiftSettings: [.swiftLanguageMode(.v5)]
Expand All @@ -51,7 +53,8 @@ let package = Package(
dependencies: [],
path: "Vendor/github.com/apple/swift-nio-extras/Sources/CNIOExtrasZlib",
linkerSettings: [.linkedLibrary("z")]
), .target(name: "Tar"),
),
.target(name: "Tar"),
.target(
// Vendored from https://github.com/apple/swift-package-manager with modifications
name: "Basics",
Expand Down Expand Up @@ -86,7 +89,8 @@ let package = Package(
name: "ContainerRegistryTests",
dependencies: [.target(name: "ContainerRegistry")],
resources: [.process("Resources")]
), .testTarget(name: "containertoolTests", dependencies: [.target(name: "containertool")]),
),
.testTarget(name: "containertoolTests", dependencies: [.target(name: "containertool")]),
.testTarget(name: "TarTests", dependencies: [.target(name: "Tar")]),
],
swiftLanguageModes: [.v6]
Expand Down
41 changes: 25 additions & 16 deletions Sources/containertool/containertool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,45 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
abstract: "Build and upload a container image"
)

@Option(help: "Default registry for references which do not specify a registry") private var defaultRegistry:
String = ProcessInfo.processInfo.environment["CONTAINERTOOL_DEFAULT_REGISTRY"] ?? "docker.io"
@Option(help: "Default registry for references which do not specify a registry")
private var defaultRegistry: String =
ProcessInfo.processInfo.environment["CONTAINERTOOL_DEFAULT_REGISTRY"] ?? "docker.io"

@Option(help: "Repository path") private var repository: String
@Option(help: "Repository path")
private var repository: String

@Argument(help: "Executable to package") private var executable: String
@Argument(help: "Executable to package")
private var executable: String

@Option(help: "Username") private var username: String?
@Option(help: "Username")
private var username: String?

@Option(help: "Password") private var password: String?
@Option(help: "Password")
private var password: String?

@Flag(name: .shortAndLong, help: "Verbose output") private var verbose: Bool = false
@Flag(name: .shortAndLong, help: "Verbose output")
private var verbose: Bool = false

@Option(help: "Connect to the container registry using plaintext HTTP") var allowInsecureHttp: AllowHTTP?
@Option(help: "Connect to the container registry using plaintext HTTP")
var allowInsecureHttp: AllowHTTP?

@Option(help: "CPU architecture") private var architecture: String =
ProcessInfo.processInfo.environment["CONTAINERTOOL_ARCHITECTURE"] ?? "amd64"
@Option(help: "CPU architecture")
private var architecture: String = ProcessInfo.processInfo.environment["CONTAINERTOOL_ARCHITECTURE"] ?? "amd64"

@Option(help: "Base image reference") private var from: String =
ProcessInfo.processInfo.environment["CONTAINERTOOL_BASE_IMAGE"] ?? "swift:slim"
@Option(help: "Base image reference")
private var from: String = ProcessInfo.processInfo.environment["CONTAINERTOOL_BASE_IMAGE"] ?? "swift:slim"

@Option(help: "Operating system") private var os: String =
ProcessInfo.processInfo.environment["CONTAINERTOOL_OS"] ?? "linux"
@Option(help: "Operating system")
private var os: String = ProcessInfo.processInfo.environment["CONTAINERTOOL_OS"] ?? "linux"

@Option(help: "Tag for this manifest") private var tag: String?
@Option(help: "Tag for this manifest")
private var tag: String?

@Flag(inversion: .prefixedEnableDisable, exclusivity: .exclusive, help: "Load credentials from a netrc file")
private var netrc: Bool = true

@Option(help: "Specify the netrc file path") private var netrcFile: String?
@Option(help: "Specify the netrc file path")
private var netrcFile: String?

func run() async throws {
let baseimage = try ImageReference(fromString: from, defaultRegistry: defaultRegistry)
Expand Down