From 0968caa6e9e97443eeaf964ded30376cebbc5712 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 23 Nov 2022 14:00:49 +0100 Subject: [PATCH] nits on nsjail config --- .../windmill-worker/nsjail/run.bash.config.proto | 15 +++++++-------- .../windmill-worker/nsjail/run.deno.config.proto | 7 +++++++ .../windmill-worker/nsjail/run.go.config.proto | 7 +++++++ .../nsjail/run.python3.config.proto | 7 +++++++ .../src/lib/components/graph/FlowGraph.svelte | 2 +- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/backend/windmill-worker/nsjail/run.bash.config.proto b/backend/windmill-worker/nsjail/run.bash.config.proto index 8dc062cf0c..1c956ad026 100644 --- a/backend/windmill-worker/nsjail/run.bash.config.proto +++ b/backend/windmill-worker/nsjail/run.bash.config.proto @@ -78,6 +78,13 @@ mount { mandatory: false } +mount { + src: "/etc/ca-certificates" + dst: "/etc/ca-certificates" + is_bind: true + mandatory: false +} + mount { src: "/etc/resolv.conf" dst: "/etc/resolv.conf" @@ -92,14 +99,6 @@ mount { iface_no_lo: true -mount { - src: "{CACHE_DIR}" - dst: "/tmp/.cache/go" - is_bind: true - rw: true - mandatory: false -} - {SHARED_MOUNT} diff --git a/backend/windmill-worker/nsjail/run.deno.config.proto b/backend/windmill-worker/nsjail/run.deno.config.proto index 1df90c9cd2..f1b0177943 100644 --- a/backend/windmill-worker/nsjail/run.deno.config.proto +++ b/backend/windmill-worker/nsjail/run.deno.config.proto @@ -105,6 +105,13 @@ mount { mandatory: false } +mount { + src: "/etc/ca-certificates" + dst: "/etc/ca-certificates" + is_bind: true + mandatory: false +} + mount { src: "/etc/resolv.conf" dst: "/etc/resolv.conf" diff --git a/backend/windmill-worker/nsjail/run.go.config.proto b/backend/windmill-worker/nsjail/run.go.config.proto index 06df281edc..007b9edb64 100644 --- a/backend/windmill-worker/nsjail/run.go.config.proto +++ b/backend/windmill-worker/nsjail/run.go.config.proto @@ -93,6 +93,13 @@ mount { mandatory: false } +mount { + src: "/etc/ca-certificates" + dst: "/etc/ca-certificates" + is_bind: true + mandatory: false +} + mount { src: "/etc/resolv.conf" dst: "/etc/resolv.conf" diff --git a/backend/windmill-worker/nsjail/run.python3.config.proto b/backend/windmill-worker/nsjail/run.python3.config.proto index b27037d8ee..78a1aaf93b 100644 --- a/backend/windmill-worker/nsjail/run.python3.config.proto +++ b/backend/windmill-worker/nsjail/run.python3.config.proto @@ -104,6 +104,13 @@ mount { mandatory: false } +mount { + src: "/etc/ca-certificates" + dst: "/etc/ca-certificates" + is_bind: true + mandatory: false +} + mount { src: "/etc/resolv.conf" dst: "/etc/resolv.conf" diff --git a/frontend/src/lib/components/graph/FlowGraph.svelte b/frontend/src/lib/components/graph/FlowGraph.svelte index 215d44628b..e6ad024d3a 100644 --- a/frontend/src/lib/components/graph/FlowGraph.svelte +++ b/frontend/src/lib/components/graph/FlowGraph.svelte @@ -112,7 +112,7 @@ return flowModuleToNode( parentIds, module.id, - module.summary || 'Identity script', + module.summary || 'Identity step', 'inline', module, undefined,