diff --git a/BUILD.bazel b/BUILD.bazel index 1ef1e5d..03c970e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_bazel_lib//lib:run_binary.bzl", "run_binary") load("@bazel_gazelle//:def.bzl", "gazelle") -load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier") # gazelle:prefix github.com/buildbarn/bb-deployments # gazelle:exclude dummy_for_dependencies.go @@ -18,5 +17,14 @@ run_binary( "no-cache": "1", }, tool = ":ls-proc", - srcs = ["usr/bin/env"], + srcs = [ + # env is required in path resolution for chroot actions. + "usr/bin/env", + # Not strictly needed, but symmetric with sys and proc. + "dev/dummy", + # Send a directory for /sys and /proc + # Bazel wants a file for it to send the directory. + "sys/dummy", + "proc/dummy", + ], ) diff --git a/bare/config/runner.jsonnet b/bare/config/runner.jsonnet index a01863d..82dfa19 100644 --- a/bare/config/runner.jsonnet +++ b/bare/config/runner.jsonnet @@ -7,17 +7,4 @@ local common = import 'common.libsonnet'; listenPaths: ['worker/runner'], authenticationPolicy: { allow: {} }, }], - chrootIntoInputRoot: true, - inputRootMounts: [ - { - mountpoint: 'proc', - source: '/proc', - filesystemType: 'proc', - }, - { - mountpoint: 'sys', - source: '/sys', - filesystemType: 'sysfs', - }, - ], } diff --git a/bare/config/worker.jsonnet b/bare/config/worker.jsonnet index 7c981d5..2eebc39 100644 --- a/bare/config/worker.jsonnet +++ b/bare/config/worker.jsonnet @@ -26,6 +26,9 @@ local common = import 'common.libsonnet'; 'zero', ], concurrency: 8, + environment_variables: { + PATH: '/usr/bin', + }, platform: {}, workerId: { datacenter: 'paris', diff --git a/docker-compose/config/runner-ubuntu22-04.jsonnet b/docker-compose/config/runner-ubuntu22-04.jsonnet index e9f7685..7f08b6d 100644 --- a/docker-compose/config/runner-ubuntu22-04.jsonnet +++ b/docker-compose/config/runner-ubuntu22-04.jsonnet @@ -7,17 +7,4 @@ local common = import 'common.libsonnet'; listenPaths: ['/worker/runner'], authenticationPolicy: { allow: {} }, }], - chrootIntoInputRoot: true, - inputRootMounts: [ - { - mountpoint: 'proc', - source: '/proc', - filesystemType: 'proc', - }, - { - mountpoint: 'sys', - source: '/sys', - filesystemType: 'sysfs', - }, - ], } diff --git a/docker-compose/config/worker-fuse-ubuntu22-04.jsonnet b/docker-compose/config/worker-fuse-ubuntu22-04.jsonnet index d93d7af..92734de 100644 --- a/docker-compose/config/worker-fuse-ubuntu22-04.jsonnet +++ b/docker-compose/config/worker-fuse-ubuntu22-04.jsonnet @@ -75,6 +75,9 @@ local common = import 'common.libsonnet'; 'urandom', 'zero', ], + environment_variables: { + PATH: '/usr/bin', + }, platform: { properties: [ { name: 'OSFamily', value: 'linux' },