mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-25 16:02:11 +00:00
fix adding nsjail based on arg
This commit is contained in:
+3
-3
@@ -4,7 +4,7 @@ WORKDIR /nsjail
|
||||
|
||||
ARG nsjail=""
|
||||
|
||||
RUN if [[ "$nsjail" == "true" ]]; then apt-get -y update \
|
||||
RUN if [ "$nsjail" = "true" ]; then apt-get -y update \
|
||||
&& apt-get install -y \
|
||||
bison=2:3.3.* \
|
||||
flex=2.6.* \
|
||||
@@ -18,9 +18,9 @@ RUN if [[ "$nsjail" == "true" ]]; then apt-get -y update \
|
||||
protobuf-compiler=3.6.*; fi
|
||||
|
||||
|
||||
RUN if [[ "$nsjail" == "true" ]]; then git clone -b master --single-branch https://github.com/google/nsjail.git . \
|
||||
RUN if [ "$nsjail" = "true" ]; then git clone -b master --single-branch https://github.com/google/nsjail.git . \
|
||||
&& git checkout dccf911fd2659e7b08ce9507c25b2b38ec2c5800; fi
|
||||
RUN if [[ "$nsjail" == "true" ]]; then make; else touch nsjail; fi
|
||||
RUN if [ "$nsjail" = "true" ]; then make; else touch nsjail; fi
|
||||
|
||||
FROM rust:slim-buster AS rust_base
|
||||
|
||||
|
||||
@@ -1017,7 +1017,7 @@ async fn handle_code_execution_job(
|
||||
r#"
|
||||
mount {{
|
||||
src: "{worker_dir}/{}/shared"
|
||||
dst: "/shared"
|
||||
dst: "/tmp/shared"
|
||||
is_bind: true
|
||||
rw: true
|
||||
}}
|
||||
@@ -1029,7 +1029,7 @@ mount {{
|
||||
} else {
|
||||
r#"
|
||||
mount {
|
||||
dst: "/shared"
|
||||
dst: "/tmp/shared"
|
||||
fstype: "tmpfs"
|
||||
rw: true
|
||||
options: "size=500000000"
|
||||
|
||||
Reference in New Issue
Block a user