16306: shut up bundle warnings about /var/www

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/cmd/arvados-dev/buildpackage.go b/cmd/arvados-dev/buildpackage.go
index 00713550d1f1e8778c7bdc2380baf6d47525364c..125ac36b1dfe3194fa60a510a47ceca2aca3837a 100644 (file)
--- a/cmd/arvados-dev/buildpackage.go
+++ b/cmd/arvados-dev/buildpackage.go
@@ -91,6 +91,7 @@ func (bldr *builder) run(ctx context.Context, prog string, args []string, stdin
                "/var/lib/arvados",
                "/var/www/.gem",
                "/var/www/.passenger",
+               "/var/www/.bundle",
        )
        fmt.Fprintf(stderr, "... %s\n", cmd.Args)
        cmd.Dir = bldr.OutputDir

diff --git a/lib/install/deps.go b/lib/install/deps.go
index b39515cb14d7e3c706b865fa2f54c051b226db25..3ff23d6e93434df9bc8bf91c06a4d807ff414229 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -428,9 +428,9 @@ rm ${zip}
                                return 1
                        }
                        for _, cmdline := range [][]string{
-                               {"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.passenger"},
+                               {"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger"},
                                {"touch", "log/production.log"},
-                               {"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.gem", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
+                               {"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--deployment", "--jobs", "8", "--path", "/var/www/.gem"},
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "build-native-support"},