starred/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-08-24 10:05:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

volumes: Allow "." (#1326)

Browse Source 
We should allow passing . for the src of a volume.
This commit is contained in:
Danny Canter
2026-03-18 12:29:22 -07:00
committed by GitHub
parent f8ba57ebd2
commit 77ed6c54ed
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Services/ContainerAPIService/Client/Parser.swift
+2 -2
View File
@@ -515,8 +515,8 @@ public struct Parser {
let src = String(parts[0])
let dst = String(parts[1])
// Check if it's a filesystem path
guard src.contains("/") else {
// Check if it's a filesystem path (absolute, or relative like ".", "..", "./foo", "../foo")
guard src.contains("/") || src == "." || src == ".." else {
// Named volume - validate name syntax only
guard VolumeStorage.isValidVolumeName(src) else {
throw ContainerizationError(.invalidArgument, message: "invalid volume name '\(src)': must match \(VolumeStorage.volumeNamePattern)")
Tests/ContainerAPIClientTests/ParserTest.swift
+42
View File
@@ -392,6 +392,48 @@ struct ParserTest {
#expect(Bool(false), "Expected filesystem mount, got volume")
}
}
// Test volume with bare "." as source (current directory)
do {
let tempDir = FileManager.default.temporaryDirectory.appendingPathComponent("test-volume-dot-\(UUID().uuidString)")
try FileManager.default.createDirectory(at: tempDir, withIntermediateDirectories: true)
defer {
try? FileManager.default.removeItem(at: tempDir)
}
let result = try Parser.volume(".:/docs:ro", relativeTo: tempDir)
switch result {
case .filesystem(let fs):
let expectedPath = tempDir.standardizedFileURL.path
#expect(fs.source.trimmingCharacters(in: CharacterSet(charactersIn: "/")) == expectedPath.trimmingCharacters(in: CharacterSet(charactersIn: "/")))
#expect(fs.destination == "/docs")
#expect(fs.options.contains("ro"))
case .volume:
#expect(Bool(false), "Expected filesystem mount, got volume")
}
}
// Test volume with ".." as source (parent directory)
do {
let tempDir = FileManager.default.temporaryDirectory.appendingPathComponent("test-volume-dotdot-\(UUID().uuidString)")
let childDir = tempDir.appendingPathComponent("child")
try FileManager.default.createDirectory(at: childDir, withIntermediateDirectories: true)
defer {
try? FileManager.default.removeItem(at: tempDir)
}
let result = try Parser.volume("..:/data", relativeTo: childDir)
switch result {
case .filesystem(let fs):
let expectedPath = tempDir.standardizedFileURL.path
#expect(fs.source.trimmingCharacters(in: CharacterSet(charactersIn: "/")) == expectedPath.trimmingCharacters(in: CharacterSet(charactersIn: "/")))
#expect(fs.destination == "/data")
case .volume:
#expect(Bool(false), "Expected filesystem mount, got volume")
}
}
}
@Test