Skip to content

fix(cli): support context-less builds via standard input (fixes #2139) #2147

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

fix(cli): support context-less builds via standard input (fixes #2139) #2147

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
36 changes: 26 additions & 10 deletions Sources/ContainerCommands/BuildCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,23 @@ extension Application {
terminal, buildArg, secretsData, ssh, contextDir, ignoreFileData, label, noCache, target, quiet, cacheIn, cacheOut, pull, exports, imageNames, tempURL,
log
] in

let actualContextDir: String
if contextDir == "-" {
let emptyContextURL = tempURL.appendingPathComponent("empty-context")
try? FileManager.default.createDirectory(at: emptyContextURL, withIntermediateDirectories: true, attributes: nil)
actualContextDir = emptyContextURL.path
} else {
actualContextDir = contextDir
}

let config = Builder.BuildConfig(
buildID: buildID,
contentStore: RemoteContentStoreClient(),
buildArgs: buildArg,
secrets: secretsData,
ssh: ssh,
contextDir: contextDir,
contextDir: actualContextDir,
dockerfile: buildFileData,
dockerignore: ignoreFileData,
labels: label,
Expand Down Expand Up @@ -474,8 +484,10 @@ extension Application {

public mutating func validate() throws {
// NOTE: Here we check the Dockerfile exists, and set `dockerfile` to point the valid Dockerfile path or stdin
guard FileManager.default.fileExists(atPath: contextDir) else {
throw ValidationError("context dir does not exist \(contextDir)")
if contextDir != "-" {
guard FileManager.default.fileExists(atPath: contextDir) else {
throw ValidationError("context dir does not exist \(contextDir)")
}
}
for name in targetImageNames {
guard let _ = try? Reference.parse(name) else {
Expand All @@ -496,15 +508,19 @@ extension Application {
dockerfile = fileURL.path
break
case .none:
guard let defaultDockerfile = try BuildFile.resolvePath(contextDir: contextDir) else {
throw ValidationError("dockerfile not found in context dir")
}
if contextDir == "-" {
dockerfile = "-"
} else {
guard let defaultDockerfile = try BuildFile.resolvePath(contextDir: contextDir) else {
throw ValidationError("dockerfile not found in context dir")
}

guard FileManager.default.fileExists(atPath: defaultDockerfile) else {
throw ValidationError("dockerfile does not exist \(defaultDockerfile)")
}
guard FileManager.default.fileExists(atPath: defaultDockerfile) else {
throw ValidationError("dockerfile does not exist \(defaultDockerfile)")
}

dockerfile = defaultDockerfile
dockerfile = defaultDockerfile
}
break
}

Expand Down