Skip to content

config: add env_merge support to containers.conf #791

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
jiwahn wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

config: add env_merge support to containers.conf #791

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions common/docs/containers.conf.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ overwriting values specified on the command line when the container was created.

Pass all host environment variables into the container.

**env_merge**=[]

Preprocess default environment variables for the container.
Works the same as the **--env-merge** command line option.
The value of existing variables in the image will be used for substitution.

Example: `env_merge=["PATH=${PATH}:/custom/bin"]`

**host_containers_internal_ip**=""

Set the IP address the container should expect to connect to the host. The IP
Expand Down
3 changes: 3 additions & 0 deletions common/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ type ContainersConfig struct {
// EnvHost Pass all host environment variables into the container.
EnvHost bool `toml:"env_host,omitempty"`

// EnvMerge preprocess the environment variables list for the container.
EnvMerge []string `toml:"env_merge,omitempty"`

// HostContainersInternalIP is used to set a specific host.containers.internal ip.
HostContainersInternalIP string `toml:"host_containers_internal_ip,omitempty"`

Expand Down
4 changes: 4 additions & 0 deletions common/pkg/config/containers.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ default_sysctls = [
#
#env_host = false

# Preprocess default environment variables for the container.
#
#env_merge = []

# Set the IP address the container should expect to connect to the host. The IP
# address is used by Podman to automatically add the `host.containers.internal`
# and `host.docker.internal` hostnames to the container's `/etc/hosts` file. It
Expand Down
1 change: 1 addition & 0 deletions common/pkg/config/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ func defaultConfig() (*Config, error) {
EnableLabeling: selinuxEnabled(),
Env: configfile.NewSlice(defaultContainerEnv),
EnvHost: false,
EnvMerge: []string{},
Copy link
Copy Markdown
Member

@jankaluza jankaluza May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not an expert in this part of code, but I think you should use configfile.Slice{} instead of []string{}. The reason is that without configfile.Slice{}, the https://github.com/containers/common/blob/main/docs/containers.conf.5.md#appending-to-string-arrays won't work.

Copy link
Copy Markdown
Member

@Luap99 Luap99 May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct configfile.Slice must be used over normal string slices

HTTPProxy: true,
IPCNS: "shareable",
Init: false,
Expand Down
Loading