From 51e1447ec7700dc4acbfa422e1a3ba7edc375962 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 14 Jul 2023 16:13:12 +0200
Subject: [PATCH] use --copy-links

---
 Dockerfile                                  |  2 +-
 backend/windmill-worker/src/global_cache.rs | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 50e798ce15..f8d6cdbf0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -174,7 +174,7 @@ RUN chmod 755 /usr/bin/deno
 
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
-COPY --from=oven/bun:0.6.13 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:0.6.14 /usr/local/bin/bun /usr/bin/bun
 
 # add the docker client to call docker from a worker if enabled
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
diff --git a/backend/windmill-worker/src/global_cache.rs b/backend/windmill-worker/src/global_cache.rs
index d9ee6278cc..6cad505e3a 100644
--- a/backend/windmill-worker/src/global_cache.rs
+++ b/backend/windmill-worker/src/global_cache.rs
@@ -50,7 +50,7 @@ pub async fn build_tar_and_push(bucket: &str, folder: String) -> error::Result<(
             &tar_path,
             &format!(":s3,env_auth=true:{bucket}/tar/pip/{folder_name}.tar"),
             "-v",
-            "--links",
+            "-L",
             "--size-only",
             "--fast-list",
             "--s3-no-check-bucket",
@@ -88,7 +88,7 @@ pub async fn pull_from_tar(bucket: &str, folder: String) -> error::Result<()> {
             &format!(":s3,env_auth=true:{bucket}/{tar_path}"),
             &target,
             "-v",
-            "--links",
+            "-L",
             "--size-only",
             "--fast-list",
         ],
@@ -148,7 +148,7 @@ pub async fn copy_cache_from_bucket(bucket: &str, tx: Sender<()>) -> error::Resu
             "copy",
             &format!(":s3,env_auth=true:{bucket}"),
             &ROOT_TMP_CACHE_DIR,
-            "--links",
+            "-L",
             "--size-only",
             "--fast-list",
             "--filter",
@@ -193,7 +193,7 @@ pub async fn copy_cache_to_bucket(bucket: &str) -> error::Result<()> {
             "copy",
             &ROOT_TMP_CACHE_DIR,
             &format!(":s3,env_auth=true:{bucket}"),
-            "--links",
+            "-L",
             "--size-only",
             "--fast-list",
             "--filter",
@@ -257,7 +257,7 @@ pub async fn copy_cache_to_bucket_as_tar(bucket: &str) {
             "copyto",
             &format!("{ROOT_TMP_CACHE_DIR}{TAR_CACHE_FILENAME}"),
             &format!(":s3,env_auth=true:{bucket}/{TAR_CACHE_FILENAME}"),
-            "--links",
+            "-L",
             "-v",
             "--size-only",
             "--fast-list",
@@ -298,7 +298,7 @@ pub async fn copy_denogo_cache_from_bucket_as_tar(bucket: &str) {
             "copyto",
             &format!(":s3,env_auth=true:{bucket}/{TAR_CACHE_FILENAME}"),
             &format!("{ROOT_TMP_CACHE_DIR}{TAR_CACHE_FILENAME}"),
-            "--links",
+            "-L",
             "-v",
             "--size-only",
             "--fast-list",
@@ -355,7 +355,7 @@ pub async fn copy_all_piptars_from_bucket(bucket: &str) {
             "copy",
             &format!(":s3,env_auth=true:{bucket}/tar/pip/"),
             &TAR_PIP_TMP_CACHE_DIR,
-            "--links",
+            "-L",
             "-v",
             "--size-only",
             "--fast-list",
@@ -397,7 +397,7 @@ pub async fn copy_tmp_cache_to_cache() -> error::Result<()> {
             "sync",
             ROOT_TMP_CACHE_DIR,
             ROOT_CACHE_DIR,
-            "--links",
+            "-L",
             "--filter",
             "- deno/gen/file/**",
             "--filter",
@@ -490,7 +490,7 @@ pub async fn copy_cache_to_tmp_cache() -> error::Result<()> {
             "sync",
             ROOT_CACHE_DIR,
             ROOT_TMP_CACHE_DIR,
-            "--links",
+            "-L",
             "--filter",
             "- deno/gen/file/**",
             "--filter",