Skip to content

fix: support relative paths in host path volumes #42

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
ttys3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support relative paths in host path volumes #42

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
17 changes: 10 additions & 7 deletions Sources/Container-Compose/Commands/ComposeUp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,26 +664,29 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
var isDirectory: ObjCBool = false
// Ensure the path is absolute or relative to the current directory for FileManager
let fullHostPath = (source.starts(with: "/") || source.starts(with: "~")) ? source : (cwd + "/" + source)
// Normalize the path to remove ./ and ../ components, and convert to absolute path
let normalizedHostPath = URL(fileURLWithPath: fullHostPath).standardizedFileURL.path(percentEncoded: false)

if fileManager.fileExists(atPath: fullHostPath, isDirectory: &isDirectory) {
if fileManager.fileExists(atPath: normalizedHostPath, isDirectory: &isDirectory) {
if isDirectory.boolValue {
// Host path exists and is a directory, add the volume
runCommandArgs.append("-v")
// Reconstruct the volume string without mode, ensuring it's source:destination
runCommandArgs.append("\(source):\(destination)") // Use original source for command argument
// Use normalized absolute path for container command (container tool requires absolute paths)
runCommandArgs.append("\(normalizedHostPath):\(destination)")
} else {
// Host path exists but is a file
print("Warning: Volume mount source '\(source)' is a file. The 'container' tool does not support direct file mounts. Skipping this volume.")
}
} else {
// Host path does not exist, assume it's meant to be a directory and try to create it.
do {
try fileManager.createDirectory(atPath: fullHostPath, withIntermediateDirectories: true, attributes: nil)
print("Info: Created missing host directory for volume: \(fullHostPath)")
try fileManager.createDirectory(atPath: normalizedHostPath, withIntermediateDirectories: true, attributes: nil)
print("Info: Created missing host directory for volume: \(normalizedHostPath)")
runCommandArgs.append("-v")
runCommandArgs.append("\(source):\(destination)") // Use original source for command argument
// Use normalized absolute path for container command (container tool requires absolute paths)
runCommandArgs.append("\(normalizedHostPath):\(destination)")
} catch {
print("Error: Could not create host directory '\(fullHostPath)' for volume '\(resolvedVolume)': \(error.localizedDescription). Skipping this volume.")
print("Error: Could not create host directory '\(normalizedHostPath)' for volume '\(resolvedVolume)': \(error.localizedDescription). Skipping this volume.")
}
}
} else {
Expand Down