starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-18 16:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add DOTNET_ROOT env variable (#4921)

Browse Source
This commit is contained in:
wendrul
2024-12-13 17:54:56 +01:00
committed by GitHub
parent 3634ade41b
commit eb3ed7a2c7
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/src/csharp_executor.rs
+5
View File
@@ -48,6 +48,8 @@ const NSJAIL_CONFIG_RUN_CSHARP_CONTENT: &str = include_str!("../nsjail/run.cshar
#[cfg(feature = "csharp")]
lazy_static::lazy_static! {
static ref HOME_DIR: String = std::env::var("HOME").expect("Could not find the HOME environment variable");
static ref DOTNET_ROOT: String = std::env::var("DOTNET_ROOT").expect("Could not find the DOTNET_ROOT environment variable");
}
#[cfg(feature = "csharp")]
@@ -281,6 +283,7 @@ async fn build_cs_proj(
.env("HOME", HOME_ENV.as_str())
.env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
.env("DOTNET_NOLOGO", "true")
.env("DOTNET_ROOT", DOTNET_ROOT.as_str())
.args(vec![
"publish",
"--configuration",
@@ -493,6 +496,7 @@ pub async fn handle_csharp_job(
.env("BASE_INTERNAL_URL", base_internal_url)
.env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
.env("DOTNET_NOLOGO", "true")
.env("DOTNET_ROOT", DOTNET_ROOT.as_str())
.args(vec!["--config", "run.config.proto", "--", "/tmp/main"])
.stdout(Stdio::piped())
.stderr(Stdio::piped());
@@ -509,6 +513,7 @@ pub async fn handle_csharp_job(
.env("TZ", TZ_ENV.as_str())
.env("DOTNET_CLI_TELEMETRY_OPTOUT", "true")
.env("DOTNET_NOLOGO", "true")
.env("DOTNET_ROOT", DOTNET_ROOT.as_str())
.env("BASE_INTERNAL_URL", base_internal_url)
.env("HOME", HOME_ENV.as_str())
.stdout(Stdio::piped())
docker/DockerfileFull
+1
View File
@@ -7,3 +7,4 @@ RUN pip3 install ansible
COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk
RUN ln -s /opt/dotnet-sdk/bin/dotnet /usr/bin/dotnet
ENV DOTNET_ROOT="/opt/dotnet-sdk/bin"
docker/DockerfileFullEe
+1
View File
@@ -7,3 +7,4 @@ RUN pip3 install ansible
COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk
RUN ln -s /opt/dotnet-sdk/bin/dotnet /usr/bin/dotnet
ENV DOTNET_ROOT="/opt/dotnet-sdk/bin"
docker/DockerfileNsjail
+1
View File
@@ -32,5 +32,6 @@ RUN pip3 install ansible
COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk
RUN ln -s /opt/dotnet-sdk/bin/dotnet /usr/bin/dotnet
ENV DOTNET_ROOT="/opt/dotnet-sdk/bin"
COPY --from=nsjail /nsjail/nsjail /bin/nsjail