From b65a8636bb5b2ee61c69660aa6f7edc7d909e632 Mon Sep 17 00:00:00 2001
From: Tiago Natel de Moura <t.nateldemoura@f5.com>
Date: Tue, 25 Aug 2020 15:25:51 +0100
Subject: Isolation: added "automount" option.

Now it's possible to disable default bind mounts of
languages by setting:

  {
      "isolation": {
           "automount": {
               "language_deps": false
           }
     }
  }

In this case, the user is responsible to provide a "rootfs"
containing the language libraries and required files for
the application.
---
 auto/modules/java   |  6 +++---
 auto/modules/php    |  6 +++---
 auto/modules/python |  2 +-
 auto/modules/ruby   | 14 +++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'auto/modules')

diff --git a/auto/modules/java b/auto/modules/java
index fa68f573..be8f443c 100644
--- a/auto/modules/java
+++ b/auto/modules/java
@@ -326,11 +326,11 @@ cat << END > $NXT_BUILD_DIR/$NXT_JAVA_MOUNTS_HEADER
 
 
 static const nxt_fs_mount_t  nxt_java_mounts[] = {
-    {(u_char *) "proc", (u_char *) "/proc", (u_char *) "proc", 0, NULL},
+    {(u_char *) "proc", (u_char *) "/proc", (u_char *) "proc", 0, NULL, 1},
     {(u_char *) "$NXT_JAVA_LIBC_DIR", (u_char *) "$NXT_JAVA_LIBC_DIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_JAVA_HOME", (u_char *) "$NXT_JAVA_HOME",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
 };
 
 
diff --git a/auto/modules/php b/auto/modules/php
index 0ba82eae..848fc1bc 100644
--- a/auto/modules/php
+++ b/auto/modules/php
@@ -233,11 +233,11 @@ NXT_PHP_MOUNTS_HEADER=nxt_${NXT_PHP_MODULE}_mounts.h
 cat << END > $NXT_BUILD_DIR/$NXT_PHP_MOUNTS_HEADER
 static const nxt_fs_mount_t  nxt_php_mounts[] = {
     {(u_char *) "$NXT_PHP_EXT_DIR", (u_char *) "$NXT_PHP_EXT_DIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_PHP_LIBC_DIR", (u_char *) "$NXT_PHP_LIBC_DIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_PHP_SYSLIB_DIR", (u_char *) "$NXT_PHP_SYSLIB_DIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
 };
 
 END
diff --git a/auto/modules/python b/auto/modules/python
index c14bf7e0..58d8f66f 100644
--- a/auto/modules/python
+++ b/auto/modules/python
@@ -138,7 +138,7 @@ pyver = "python" + str(sys.version_info[0]) + "." + str(sys.version_info[1])
 
 print("static const nxt_fs_mount_t  nxt_python_mounts[] = {")
 
-pattern = "{(u_char *) \"%s\", (u_char *) \"%s\", (u_char *) \"bind\", NXT_MS_BIND|NXT_MS_REC, NULL},"
+pattern = "{(u_char *) \"%s\", (u_char *) \"%s\", (u_char *) \"bind\", NXT_MS_BIND|NXT_MS_REC, NULL, 1},"
 base = None
 for p in sys.path:
     if len(p) > 0:
diff --git a/auto/modules/ruby b/auto/modules/ruby
index c1444f07..e0d54516 100644
--- a/auto/modules/ruby
+++ b/auto/modules/ruby
@@ -156,23 +156,23 @@ cat << END > $NXT_RUBY_MOUNTS_PATH
 
 static const nxt_fs_mount_t  nxt_ruby_mounts[] = {
     {(u_char *) "$NXT_RUBY_RUBYHDRDIR", (u_char *) "$NXT_RUBY_RUBYHDRDIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_RUBY_ARCHHDRDIR", (u_char *) "$NXT_RUBY_ARCHHDRDIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_RUBY_SITEDIR", (u_char *) "$NXT_RUBY_SITEDIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_RUBY_LIBDIR", (u_char *) "$NXT_RUBY_LIBDIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_RUBY_TOPDIR", (u_char *) "$NXT_RUBY_TOPDIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
     {(u_char *) "$NXT_RUBY_PREFIXDIR", (u_char *) "$NXT_RUBY_PREFIXDIR",
-     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL},
+     (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1},
 
 END
 
 for path in `echo $NXT_RUBY_GEMPATH | tr ':' '\n'`; do
    $echo "{(u_char *) \"$path\", (u_char *) \"$path\"," >> $NXT_RUBY_MOUNTS_PATH
-   $echo "(u_char *) \"bind\", NXT_MS_BIND | NXT_MS_REC, NULL}," >> $NXT_RUBY_MOUNTS_PATH
+   $echo "(u_char *) \"bind\", NXT_MS_BIND | NXT_MS_REC, NULL, 1}," >> $NXT_RUBY_MOUNTS_PATH
 done
 
 $echo "};" >> $NXT_RUBY_MOUNTS_PATH
-- 
cgit