proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-29 08:13:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2247 from brauner/2018-03-31/expand_lxc_environment

Browse Source 
confile: expand lxc.environment
This commit is contained in:
Stéphane Graber 2018-04-02 01:08:39 -04:00 committed by GitHub
commit 0474e8a8e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/lxc.container.conf.sgml.in
View File

@ -2445,6 +2445,13 @@ dev/null proc/kcore none bind,relative 0 0
lxc.environment = APP_ENV=production lxc.environment = APP_ENV=production
lxc.environment = SYSLOG_SERVER=192.0.2.42 lxc.environment = SYSLOG_SERVER=192.0.2.42
</programlisting> </programlisting>
<para>
It is possible to inherit host environment variables by setting the
name of the variable without a "=" sign. For example:
</para>
<programlisting>
lxc.environment = PATH
</programlisting>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

16
src/lxc/confile.c
View File

@ -1096,7 +1096,21 @@ static int set_config_environment(const char *key, const char *value,
if (!list_item) if (!list_item)
goto on_error; goto on_error;
list_item->elem = strdup(value); if (!strchr(value, '=')) {
const char *env_val;
const char *env_key = value;
const char *env_var[3] = {0};
env_val = getenv(env_key);
if (!env_val)
goto on_error;
env_var[0] = env_key;
env_var[1] = env_val;
list_item->elem = lxc_string_join("=", env_var, false);
} else {
list_item->elem = strdup(value);
}
if (!list_item->elem) if (!list_item->elem)
goto on_error; goto on_error;