[checkmk-commits] Hand over REMOTE variable to docker container context

Module: check_mk Branch: master Commit: c03732e216b5535a084f2034b88f36c8a4c45be7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c03732e216b553… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Apr 6 16:20:02 2018 +0200 Hand over REMOTE variable to docker container context Change-Id: I7fc52bb7732a14bc8613e33a62637f1a122373b5 --- agents/check_mk_agent.linux | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cabbc97..e102d3a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -972,16 +972,15 @@ if type docker > /dev/null 2>&1 ; then # the container. # Once it comes to plugins and custom configuration the user needs to use # a little more complex setup. Have a look at the documentation. - # TODO: Hand over REMOTE (and other?) environment variables AGENT_PATH=$(docker container exec "$CONTAINER_ID" which check_mk_agent 2>/dev/null) if [ -n "$AGENT_PATH" ]; then - docker container exec "$CONTAINER_ID" check_mk_agent + docker container exec --env "REMOTE=$REMOTE" "$CONTAINER_ID" check_mk_agent else # TODO: In case the docker part is added to the official agent script # erase the hard coded path and replace it with 'basename "$0"'. # In case the docker stuff remains as plugin, at least replace it with # to get the agent path $(type check_mk_agent). - docker container exec --env MK_FROM_NODE=1 -i "$CONTAINER_ID" bash </usr/bin/check_mk_agent + docker container exec --env "MK_FROM_NODE=1,REMOTE=$REMOTE" -i "$CONTAINER_ID" bash </usr/bin/check_mk_agent fi echo "<<<<>>>>"