15944: Takes arvbox container's default gw IP as internal client.

This makes Keep work on 'publicdev' mode.
Also, turns off nginx's response caching for easier debugging.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 15484197eb9554c80fa97b8b3d3682dfada5cbd0..77fb3f776030c6498640cdb924807dfaaf651629 100644 (file)
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -12,6 +12,7 @@ export R_LIBS=/var/lib/Rlibs
 export HOME=$(getent passwd arvbox | cut -d: -f6)
 
 defaultdev=$(/sbin/ip route|awk '/default/ { print $5 }')
+dockerip=$(/sbin/ip route | grep default | awk '{ print $3 }')
 containerip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/')
 if test -s /var/run/localip_override ; then
     localip=$(cat /var/run/localip_override)

diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run b/tools/arvbox/lib/arvbox/docker/service/nginx/run
index 8b4c220448f2f7b99c06a8efedd3cd6faeb09058..4fcc65fa9755e7a787db4b96d88df7b093b57cc3 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run
@@ -38,6 +38,7 @@ http {
       default     1;
       127.0.0.0/8 0;
       $containerip/32 0;
+      $dockerip/32 0;
   }
 
   server {
@@ -69,6 +70,8 @@ http {
       proxy_set_header X-Forwarded-Proto https;
       proxy_set_header X-External-Client \$external_client;
       proxy_redirect off;
+      # This turns off response caching
+      proxy_buffering off;
     }
   }