From 3d5b819c9b8a21134330d962b5e7af480e75d7bc Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 6 Jul 2023 21:23:56 +0200
Subject: [PATCH] fix bun dockerfile

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 00ae1f4581..c88e6d75bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,8 +130,12 @@ COPY --from=builder /windmill/target/release/windmill ${APP}/windmill
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
 COPY --from=denoland/deno:1.35.0 /usr/bin/deno /usr/bin/deno
+<<<<<<< HEAD
 COPY --from=oven/bun:0.6.13 /usr/bin/bun /usr/bin/bun
 
+=======
+COPY --from=oven/bun:0.6.13 /usr/local/bin/bun /usr/bin/bun
+>>>>>>> 110fa649 (fix bun dockerfile)
 
 # docker does not support conditional COPY and we want to use the same Dockerfile for both amd64 and arm64 and privilege the official image
 COPY --from=lukechannings/deno:v1.35.0 /usr/bin/deno /usr/bin/deno-arm