diff --git a/.github/workflows/docker-310.yml b/.github/workflows/docker-310.yml index c50f448282..a002b7096b 100644 --- a/.github/workflows/docker-310.yml +++ b/.github/workflows/docker-310.yml @@ -2,7 +2,7 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} -name: Build and push windmill with python 3.10 +name: Build and push windmill with python 3.10 and openbb on: workflow_dispatch concurrency: @@ -38,9 +38,10 @@ jobs: with: context: . push: true + file: ./docker/DockerfileOpenbb build-args: | features=enterprise tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:310 + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:openbb labels: | org.opencontainers.image.licenses=Windmill-Enterprise-License \ No newline at end of file diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index c0f32c3ee8..878e3b62ca 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -431,6 +431,12 @@ pub async fn run_worker( .ok() .map(|x| x.split(',').map(|x| x.to_string()).collect()); + let pip_local_dependencies = if pip_local_dependencies == Some(vec!["".to_string()]) { + None + } else { + pip_local_dependencies + }; + #[cfg(feature = "enterprise")] let tar_cache_rate = std::env::var("TAR_CACHE_RATE") .ok() diff --git a/docker/Dockerfile3.10 b/docker/DockerfileOpenbb similarity index 98% rename from docker/Dockerfile3.10 rename to docker/DockerfileOpenbb index bcd5e91ad9..4002afa95d 100644 --- a/docker/Dockerfile3.10 +++ b/docker/DockerfileOpenbb @@ -129,6 +129,8 @@ COPY --from=nsjail /nsjail/nsjail /bin/nsjail COPY --from=denoland/deno:latest /usr/bin/deno /usr/bin/deno +RUN /usr/local/bin/python3 -m pip install openbb[all] + RUN mkdir -p ${APP} WORKDIR ${APP}