From 53d8640163959795fe2e7258b5fa4bc329bc88f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20H=C3=BCttemann?= <henrik.huettemann@verdigado.com>
Date: Wed, 19 Jun 2024 13:36:12 +0200
Subject: [PATCH] Copy gitleaks from container

---
 Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b3ac7ef..688f4a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM python:3.12.3-alpine3.20@sha256:32385e61c3414ffa5a6dbf52feace89f758ad68709a48d376d56a0232162665a
-COPY --from=koalaman/shellcheck:v0.10.0@sha256:2097951f02e735b613f4a34de20c40f937a6c8f18ecb170612c88c34517221fb /bin/shellcheck /bin/
+COPY --from=koalaman/shellcheck:v0.10.0@sha256:2097951f02e735b613f4a34de20c40f937a6c8f18ecb170612c88c34517221fb /bin/shellcheck /usr/bin/
+COPY --from=ghcr.io/gitleaks/gitleaks:v8.18.4@sha256:f44e526acc67786b7476db413edb993ce2d152660d32fb3eb48d9bca06fa83f8 /usr/bin/gitleaks /usr/bin/
 
 # renovate: datasource=repology depName=alpine_3_20/build-base versioning=loose
 ENV BUILD_BASE_VERSION="0.5-r3"
@@ -15,8 +16,6 @@ ENV OPENSSH_KEYGEN_VERSION="9.7_p1-r3"
 ENV PRE_COMMIT_VERSION="3.7.1"
 # renovate: datasource=rubygems depName=mdl versioning=ruby
 ENV MDL_VERSION="0.13.0"
-# renovate: datasource=repology depName=gitleaks versioning=loose
-ENV GITLEAKS_VERSION="8.18.4"
 
 RUN apk add --update --no-cache \
       build-base="${BUILD_BASE_VERSION}" \
@@ -29,8 +28,6 @@ RUN apk add --update --no-cache \
     pip install --no-cache-dir pre-commit=="${PRE_COMMIT_VERSION}" && \
     gem install --no-document mdl -v "${MDL_VERSION}" && \
     mkdir /data && \
-    git config --global --add safe.directory /data && \
-    wget https://github.com/gitleaks/gitleaks/releases/download/v${GITLEAKS_VERSION}/gitleaks_${GITLEAKS_VERSION}_linux_x64.tar.gz && \
-    tar xf gitleaks_${GITLEAKS_VERSION}_linux_x64.tar.gz && cp gitleaks /usr/bin/
+    git config --global --add safe.directory /data
 
 WORKDIR /data