Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions Sources/containertool/Extensions/RegistryClient+publish.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func publishContainerImage<Source: ImageSource, Destination: ImageDestination>(
os: String,
entrypoint: String?,
cmd: [String],
additionalEnv: [String],
resources: [String],
tag: String?,
verbose: Bool,
Expand Down Expand Up @@ -128,6 +129,13 @@ func publishContainerImage<Source: ImageSource, Destination: ImageDestination>(
inheritedConfiguration.Cmd = cmd
inheritedConfiguration.WorkingDir = "/"

if var env = inheritedConfiguration.Env {
env.append(contentsOf: additionalEnv)
inheritedConfiguration.Env = env
} else {
inheritedConfiguration.Env = additionalEnv
}

let configuration = ImageConfiguration(
created: timestamp,
architecture: architecture,
Expand Down
4 changes: 4 additions & 0 deletions Sources/containertool/containertool.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
@Option(help: "Entrypoint process")
var entrypoint: String?

@Option(parsing: .singleValue, help: "Additional environment variables to set in the container")
var env: [String] = []

@Option(parsing: .remaining, help: "Default arguments to pass to the entrypoint process")
var cmd: [String] = []
}
Expand Down Expand Up @@ -230,6 +233,7 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
os: os,
entrypoint: imageConfigurationOptions.entrypoint,
cmd: imageConfigurationOptions.cmd,
additionalEnv: imageConfigurationOptions.env,
resources: imageBuildOptions.resources,
tag: repositoryOptions.tag,
verbose: verbose,
Expand Down