From 796b346bfb52071d469989641ddbf6393ab88dce Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 9 May 2023 11:11:09 +0200
Subject: [PATCH] add cairo to openbb build

---
 backend/src/main.rs                   | 6 ++++--
 backend/windmill-queue/src/jobs.rs    | 2 +-
 backend/windmill-worker/src/worker.rs | 3 +++
 docker/DockerfileOpenbb               | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/main.rs b/backend/src/main.rs
index 392c821941..498ef6d0ca 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -21,8 +21,8 @@ use tokio::{
 };
 use windmill_common::{utils::rd_string, METRICS_ADDR};
 use windmill_worker::{
-    DENO_CACHE_DIR, DENO_TMP_CACHE_DIR, GO_CACHE_DIR, GO_TMP_CACHE_DIR, PIP_CACHE_DIR,
-    ROOT_TMP_CACHE_DIR, TAR_PIP_TMP_CACHE_DIR,
+    DENO_CACHE_DIR, DENO_TMP_CACHE_DIR, GO_CACHE_DIR, GO_TMP_CACHE_DIR, HUB_CACHE_DIR,
+    HUB_TMP_CACHE_DIR, PIP_CACHE_DIR, ROOT_TMP_CACHE_DIR, TAR_PIP_TMP_CACHE_DIR,
 };
 
 const GIT_VERSION: &str = git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
@@ -299,9 +299,11 @@ pub async fn run_workers<R: rsmq_async::RsmqConnection + Send + Sync + Clone + '
         PIP_CACHE_DIR,
         DENO_CACHE_DIR,
         GO_CACHE_DIR,
+        HUB_CACHE_DIR,
         TAR_PIP_TMP_CACHE_DIR,
         DENO_TMP_CACHE_DIR,
         GO_TMP_CACHE_DIR,
+        HUB_TMP_CACHE_DIR,
     ] {
         DirBuilder::new()
             .recursive(true)
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index ac225f84a3..663ebebcb7 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -466,7 +466,7 @@ pub async fn push<'c, R: rsmq_async::RsmqConnection + Send + 'c>(
                     Some((script.content, script.lockfile)),
                     JobKind::Script_Hub,
                     None,
-                    Some(script.language),
+                    None,
                 )
             }
             JobPayload::Code(RawCode { content, path, language, lock }) => (
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index c0677c3bac..570311312a 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -127,9 +127,12 @@ pub const ROOT_TMP_CACHE_DIR: &str = "/tmp/windmill/tmpcache/";
 pub const PIP_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "pip");
 pub const DENO_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "deno");
 pub const GO_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "go");
+pub const HUB_CACHE_DIR: &str = concatcp!(ROOT_CACHE_DIR, "hub");
+
 pub const TAR_PIP_TMP_CACHE_DIR: &str = concatcp!(ROOT_TMP_CACHE_DIR, "tar/pip");
 pub const DENO_TMP_CACHE_DIR: &str = concatcp!(ROOT_TMP_CACHE_DIR, "deno");
 pub const GO_TMP_CACHE_DIR: &str = concatcp!(ROOT_TMP_CACHE_DIR, "go");
+pub const HUB_TMP_CACHE_DIR: &str = concatcp!(ROOT_TMP_CACHE_DIR, "hub");
 
 const NUM_SECS_PING: u64 = 5;
 
diff --git a/docker/DockerfileOpenbb b/docker/DockerfileOpenbb
index 445b308a34..fbfd6202c2 100644
--- a/docker/DockerfileOpenbb
+++ b/docker/DockerfileOpenbb
@@ -90,7 +90,7 @@ FROM python:3.10.8-slim-buster
 ARG APP=/usr/src/app
 
 RUN apt-get update \
-    && apt-get install -y ca-certificates wget curl git jq libprotobuf-dev libnl-route-3-dev unzip build-essential pkg-config \
+    && apt-get install -y ca-certificates wget curl git jq libprotobuf-dev libnl-route-3-dev unzip build-essential pkg-config cairo \
     && rm -rf /var/lib/apt/lists/*
 
 RUN arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \