dgrove-oss commented on a change in pull request #4176: additional container 
factory dns configuration
URL: 
https://github.com/apache/incubator-openwhisk/pull/4176#discussion_r241808245
 
 

 ##########
 File path: 
core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/docker/DockerContainer.scala
 ##########
 @@ -93,6 +95,9 @@ object DockerContainer {
       network) ++
       environmentArgs ++
       dnsServers.flatMap(d => Seq("--dns", d)) ++
+      dnsSearch.flatMap(d => Seq("--dns-search", d)) ++
+      // NOTE: --dns-option on modern versions of docker, but is --dns-opt on 
docker 1.12
+      dnsOptions.flatMap(d => Seq("--dns-opt", d)) ++
 
 Review comment:
   It annoyingly needs to match the version of the docker client embedded in 
the invoker Dockerfile.  I could add a comment to the Dockerfile with a pointer 
to change this line of code when the version is (finally) updated.  I thought 
about making this more parameterized, but that seemed like overkill.
   
   I do need to get the ndots:5 option into the user actions resolv.conf file 
to enable user actions to invoke kube services (if the operator chooses to 
allow that), so we do need to do something.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to