emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librc: fix Docker auto detection

Browse Source 
The original auto detection of Docker containers assumed the presence of
a container environment variable. However, Docker-1.12 does not
implement this, and I'm not sure which versions of docker implemented
it.

The new test is for the presence of a file named .dockerenv in the
root directory.
This commit is contained in:
William Hubbs 2016-07-31 12:24:56 -05:00
parent f62253b833
commit ca8c29ee60
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librc/librc.c
View File

@ -285,6 +285,9 @@ detect_container(const char *systype)
return RC_SYS_RKT; return RC_SYS_RKT;
else if (file_regex("/proc/1/environ", "container=systemd-nspawn")) else if (file_regex("/proc/1/environ", "container=systemd-nspawn"))
return RC_SYS_SYSTEMD_NSPAWN; return RC_SYS_SYSTEMD_NSPAWN;
else if (exists("/.dockerenv"))
return RC_SYS_DOCKER;
/* old test, I'm not sure when this was valid. */
else if (file_regex("/proc/1/environ", "container=docker")) else if (file_regex("/proc/1/environ", "container=docker"))
return RC_SYS_DOCKER; return RC_SYS_DOCKER;
#endif #endif