Apply the pull requests

This is step three of three to verify the solution to: buildbarn/bb-remote-execution#115
stagnation · Sep 15, 2023 · 7f1b35f · 7f1b35f
1 parent d820c7a
commit 7f1b35f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/bare/config/runner.jsonnet b/bare/config/runner.jsonnet
@@ -8,4 +8,13 @@ local common = import 'common.libsonnet';
     listenPaths: ['worker/runner'],
     authenticationPolicy: { allow: {} },
   }],
+  inputRootMounts: [{
+    mountpoint: 'proc',
+    source: '/proc',
+    filesystemType: 'proc',
+  }, {
+    mountpoint: 'sys',
+    source: '/sys',
+    filesystemType: 'sysfs',
+  }],
 }
diff --git a/docker-compose/config/runner-ubuntu22-04.jsonnet b/docker-compose/config/runner-ubuntu22-04.jsonnet
@@ -8,4 +8,13 @@ local common = import 'common.libsonnet';
     listenPaths: ['/worker/runner'],
     authenticationPolicy: { allow: {} },
   }],
+  inputRootMounts: [{
+    mountpoint: 'proc',
+    source: '/proc',
+    filesystemType: 'proc',
+  }, {
+    mountpoint: 'sys',
+    source: '/sys',
+    filesystemType: 'sysfs',
+  }],
 }
diff --git a/go_dependencies.bzl b/go_dependencies.bzl
@@ -227,14 +227,17 @@ def go_dependencies():
     go_repository(
         name = "com_github_buildbarn_bb_remote_execution",
         importpath = "github.com/buildbarn/bb-remote-execution",
-        sum = "h1:BKoGfhCfn5IA4JRLMB7I4yHsM06fLvOc/zwzSxEuNrY=",
-        version = "v0.0.0-20230905173453-70efb72857b0",
+        remote = "https://github.com/stagnation/bb-remote-execution",
+        vcs = "git",
+        commit = "13e7f92c8c5a8ef9ccd8c36370ff1a04ab7bed7c",
     )
+
     go_repository(
         name = "com_github_buildbarn_bb_storage",
         importpath = "github.com/buildbarn/bb-storage",
-        sum = "h1:z9yMGmzNNjhC2KnxYGfP8bPk1/l3jpd3+rb+1YkhQg4=",
-        version = "v0.0.0-20230905110346-c04246b462b6",
+        remote = "https://github.com/stagnation/bb-storage",
+        vcs = "git",
+        commit = "4269bbca62e52239dcb4a977efb4685f01d7230b",
     )
     go_repository(
         name = "com_github_buildbarn_go_xdr",
@@ -1863,6 +1866,7 @@ def go_dependencies():
         name = "org_golang_x_sys",
         importpath = "golang.org/x/sys",
         sum = "h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=",
+        patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_sys/unix_add_Fsconfig_syscall_on_linux.patch"],
         version = "v0.12.0",
     )
     go_repository(