Skip to content

Properly handle the -f flag to be the primary file when used by up or down #36

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

Open
rtoohil wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Properly handle the -f flag to be the primary file when used by up or down #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf6ef6d
Changed the behavior of ComposeUp and ComposeDown to better handle ex…
rtoohil Nov 30, 2025
d5aaad3
Fixed tilde path expansion
rtoohil Dec 1, 2025
2c44929
Removed vestigial comments
rtoohil Dec 2, 2025
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
38 changes: 25 additions & 13 deletions Sources/Container-Compose/Commands/ComposeDown.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,37 @@ public struct ComposeDown: AsyncParsableCommand {
private var cwd: String { process.cwd ?? FileManager.default.currentDirectoryPath }

@Option(name: [.customShort("f"), .customLong("file")], help: "The path to your Docker Compose file")
var composeFilename: String = "compose.yml"
private var composePath: String { "\(cwd)/\(composeFilename)" } // Path to compose.yml
var composeFilename: String? = nil
private var composePath: String {
let filename = composeFilename ?? "compose.yml"
// Handle absolute paths and tilde expansion
if filename.hasPrefix("/") {
return filename
} else if filename.hasPrefix("~") {
return NSString(string: filename).expandingTildeInPath
} else {
return "\(cwd)/\(filename)"
}
}

private var fileManager: FileManager { FileManager.default }
private var projectName: String?

public mutating func run() async throws {

// Check for supported filenames and extensions
let filenames = [
"compose.yml",
"compose.yaml",
"docker-compose.yml",
"docker-compose.yaml",
]
for filename in filenames {
if fileManager.fileExists(atPath: "\(cwd)/\(filename)") {
composeFilename = filename
break
// Check for supported filenames and extensions only if user didn't specify -f
if composeFilename == nil {
let filenames = [
"compose.yml",
"compose.yaml",
"docker-compose.yml",
"docker-compose.yaml",
]
for filename in filenames {
if fileManager.fileExists(atPath: "\(cwd)/\(filename)") {
composeFilename = filename
break
}
}
}

Expand Down
60 changes: 36 additions & 24 deletions Sources/Container-Compose/Commands/ComposeUp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,18 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
var detatch: Bool = false

@Option(name: [.customShort("f"), .customLong("file")], help: "The path to your Docker Compose file")
var composeFilename: String = "compose.yml"
private var composePath: String { "\(cwd)/\(composeFilename)" } // Path to compose.yml
var composeFilename: String? = nil
private var composePath: String {
let filename = composeFilename ?? "compose.yml"
// Handle absolute paths and tilde expansion
if filename.hasPrefix("/") {
return filename
} else if filename.hasPrefix("~") {
return NSString(string: filename).expandingTildeInPath
} else {
return "\(cwd)/\(filename)"
}
}

@Flag(name: [.customShort("b"), .customLong("build")])
var rebuild: Bool = false
Expand Down Expand Up @@ -75,17 +85,19 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
]

public mutating func run() async throws {
// Check for supported filenames and extensions
let filenames = [
"compose.yml",
"compose.yaml",
"docker-compose.yml",
"docker-compose.yaml",
]
for filename in filenames {
if fileManager.fileExists(atPath: "\(cwd)/\(filename)") {
composeFilename = filename
break
// Check for supported filenames and extensions only if user didn't specify -f
if composeFilename == nil {
let filenames = [
"compose.yml",
"compose.yaml",
"docker-compose.yml",
"docker-compose.yaml",
]
for filename in filenames {
if fileManager.fileExists(atPath: "\(cwd)/\(filename)") {
composeFilename = filename
break
}
}
}

Expand Down Expand Up @@ -318,7 +330,7 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
return
}
let commands = [actualNetworkName]

var networkCreate = try Application.NetworkCreate.parse(commands + global.passThroughCommands())

try await networkCreate.run()
Expand All @@ -331,7 +343,7 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
guard let projectName else { throw ComposeError.invalidProjectName }

var imageToRun: String

var runCommandArgs: [String] = []

// Handle 'build' configuration
Expand All @@ -346,7 +358,7 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
// Should not happen due to Service init validation, but as a fallback
throw ComposeError.imageNotFound(serviceName)
}

// Set Run Platform
if let platform = service.platform {
runCommandArgs.append(contentsOf: ["--platform", "\(platform)"])
Expand Down Expand Up @@ -569,11 +581,11 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
}

print("Pulling Image \(imageName)...")

var commands = [
imageName
]

if let platform {
commands.append(contentsOf: ["--platform", platform])
}
Expand All @@ -600,30 +612,30 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {

// Build command arguments
var commands = ["\(self.cwd)/\(buildConfig.context)"]

// Add build arguments
for (key, value) in buildConfig.args ?? [:] {
commands.append(contentsOf: ["--build-arg", "\(key)=\(resolveVariable(value, with: environmentVariables))"])
}

// Add Dockerfile path
commands.append(contentsOf: ["--file", "\(self.cwd)/\(buildConfig.dockerfile ?? "Dockerfile")"])

// Add caching options
if noCache {
commands.append("--no-cache")
}

// Add OS/Arch
let split = service.platform?.split(separator: "/")
let os = String(split?.first ?? "linux")
let arch = String(((split ?? []).count >= 1 ? split?.last : nil) ?? "arm64")
commands.append(contentsOf: ["--os", os])
commands.append(contentsOf: ["--arch", arch])

// Add image name
commands.append(contentsOf: ["--tag", imageToRun])

// Add CPU & Memory
let cpuCount = Int64(service.deploy?.resources?.limits?.cpus ?? "2") ?? 2
let memoryLimit = service.deploy?.resources?.limits?.memory ?? "2048MB"
Expand Down