Skip to content

Add image env variables to builder start command #756

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 2 commits into from
Oct 14, 2025
+22 −20
Merged

Add image env variables to builder start command #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c38666a
Add image env variables to builder start command
katiewasnothere Oct 13, 2025
40cb3ea
Update containerization to include https://github.com/apple/container…
katiewasnothere Oct 14, 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
6 changes: 3 additions & 3 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import PackageDescription
let releaseVersion = ProcessInfo.processInfo.environment["RELEASE_VERSION"] ?? "0.0.0"
let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
let builderShimVersion = "0.6.1"
let scVersion = "0.10.0"
let scVersion = "0.10.1"

let package = Package(
name: "container",
Expand Down
34 changes: 18 additions & 16 deletions Sources/ContainerCommands/Builder/BuilderStart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,6 @@ extension Application {
let id = "buildkit"
try ContainerClient.Utility.validEntityName(id)

let processConfig = ProcessConfiguration(
executable: "/usr/local/bin/container-builder-shim",
arguments: shimArguments,
environment: [],
workingDirectory: "/",
terminal: false,
user: .id(uid: 0, gid: 0)
)

let resources = try Parser.resources(
cpus: cpus,
memory: memory
)

let image = try await ClientImage.fetch(
reference: builderImage,
platform: builderPlatform,
Expand All @@ -178,12 +164,28 @@ extension Application {
platform: builderPlatform,
progressUpdate: ProgressTaskCoordinator.handler(for: unpackTask, from: progressUpdate)
)
let imageConfig = ImageDescription(

let imageDesc = ImageDescription(
reference: builderImage,
descriptor: image.descriptor
)

var config = ContainerConfiguration(id: id, image: imageConfig, process: processConfig)
let imageConfig = try await image.config(for: builderPlatform).config
let processConfig = ProcessConfiguration(
executable: "/usr/local/bin/container-builder-shim",
arguments: shimArguments,
environment: imageConfig?.env ?? [],
workingDirectory: "/",
terminal: false,
user: .id(uid: 0, gid: 0)
)

let resources = try Parser.resources(
cpus: cpus,
memory: memory
)

var config = ContainerConfiguration(id: id, image: imageDesc, process: processConfig)
config.resources = resources
config.mounts = [
.init(
Expand Down