From 03903d06bf6b6647eacd34f8f1788ce1149f2634 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Fri, 21 Feb 2025 11:22:58 +0100
Subject: [PATCH] nit ansible

---
 Dockerfile              | 2 +-
 docker/DockerfileFull   | 2 --
 docker/DockerfileFullEe | 4 +---
 docker/DockerfileNsjail | 4 +---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1b8517428b48e..75dcdc48301c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -167,7 +167,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
 # Install UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.5.15/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.6.2/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
 
 # Preinstall python runtimes
 RUN uv python install 3.11
diff --git a/docker/DockerfileFull b/docker/DockerfileFull
index 6e159e97bca32..c64dff2e00b3e 100644
--- a/docker/DockerfileFull
+++ b/docker/DockerfileFull
@@ -3,8 +3,6 @@ FROM ghcr.io/windmill-labs/windmill:dev
 COPY --from=rust:1.81.0 /usr/local/cargo /usr/local/cargo
 COPY --from=rust:1.81.0 /usr/local/rustup /usr/local/rustup
 
-ENV UV_TOOL_BIN_DIR=/usr/local/bin
-
 RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true
 
 COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk
diff --git a/docker/DockerfileFullEe b/docker/DockerfileFullEe
index e5c0fb4f0c972..dd07bda32edb6 100644
--- a/docker/DockerfileFullEe
+++ b/docker/DockerfileFullEe
@@ -22,9 +22,7 @@ FROM ghcr.io/windmill-labs/windmill-ee:dev
 COPY --from=rust:1.81.0 /usr/local/cargo /usr/local/cargo
 COPY --from=rust:1.81.0 /usr/local/rustup /usr/local/rustup
 
-ENV UV_TOOL_BIN_DIR=/usr/local/bin
-
-RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true
+RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 -I {} mv {} "/usr/local/bin/"
 
 # dotnet SDK
 COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk
diff --git a/docker/DockerfileNsjail b/docker/DockerfileNsjail
index 2590d55b39b77..7e94b3f146da8 100644
--- a/docker/DockerfileNsjail
+++ b/docker/DockerfileNsjail
@@ -47,9 +47,7 @@ RUN apt-get update && apt-get install -y libprotobuf-dev libnl-route-3-dev
 COPY --from=rust:1.80.1 /usr/local/cargo /usr/local/cargo
 COPY --from=rust:1.80.1 /usr/local/rustup /usr/local/rustup
 
-ENV UV_TOOL_BIN_DIR=/usr/local/bin
-
-RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true
+RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 -I {} mv {} "/usr/local/bin/"
 
 # dotnet SDK
 COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk