From 80636588e304d75c7da66a193eff1ce75cb593eb Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 26 Jun 2024 19:11:43 +0200
Subject: [PATCH] chore: change deno build step in dockerfile

---
 Dockerfile     | 18 +-----------------
 lsp/Dockerfile | 19 +------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f8b9d4a90f..78b85e63f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,21 +76,6 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
     CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release --features "$features"
 
 
-FROM ${DEBIAN_IMAGE} as downloader
-
-ARG TARGETPLATFORM
-
-SHELL ["/bin/bash", "-c"]
-
-RUN apt update -y
-RUN apt install -y unzip curl
-
-RUN [ "$TARGETPLATFORM" == "linux/amd64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.44.1/deno-x86_64-unknown-linux-gnu.zip -o deno.zip || true
-RUN [ "$TARGETPLATFORM" == "linux/arm64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.44.1/deno-aarch64-unknown-linux-gnu.zip -o deno.zip || true
-
-
-RUN unzip deno.zip && rm deno.zip
-
 FROM ${PYTHON_IMAGE}
 
 ARG TARGETPLATFORM
@@ -169,8 +154,7 @@ RUN /usr/local/bin/python3 -m pip install pip-tools
 COPY --from=builder /frontend/build /static_frontend
 COPY --from=builder /windmill/target/release/windmill ${APP}/windmill
 
-
-COPY --from=downloader --chmod=755 /deno /usr/bin/deno
+COPY --from=denoland/deno:1.44.4 --chmod=755 /usr/bin/deno /usr/bin/deno
 
 COPY --from=oven/bun:1.1.8 /usr/local/bin/bun /usr/bin/bun
 
diff --git a/lsp/Dockerfile b/lsp/Dockerfile
index f4023ea5d0..736e0c01d9 100644
--- a/lsp/Dockerfile
+++ b/lsp/Dockerfile
@@ -1,19 +1,3 @@
-FROM debian:buster-slim as downloader
-
-ARG TARGETPLATFORM
-
-SHELL ["/bin/bash", "-c"]
-
-RUN apt update -y
-RUN apt install -y unzip curl
-
-RUN [ "$TARGETPLATFORM" == "linux/amd64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.44.1/deno-x86_64-unknown-linux-gnu.zip -o deno.zip || true
-RUN [ "$TARGETPLATFORM" == "linux/arm64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.44.1/deno-aarch64-unknown-linux-gnu.zip -o deno.zip || true
-
-
-RUN unzip deno.zip && rm deno.zip
-
-
 FROM nikolaik/python-nodejs:python3.11-nodejs19-slim
 
 RUN apt-get update \
@@ -42,8 +26,7 @@ ENV GOBIN=/usr/local/go/bin
 RUN /usr/local/go/bin/go install -v golang.org/x/tools/gopls@latest
 RUN pip3 install tornado python-lsp-jsonrpc ruff-lsp
 
-COPY --from=downloader /deno /usr/bin/deno
-RUN chmod 755 /usr/bin/deno
+COPY --from=denoland/deno:1.44.4 --chmod=755 /usr/bin/deno /usr/bin/deno
 
 COPY Pipfile .