From 572f93466ab0b42c5ba0ff2b89941b1bd7a15e33 Mon Sep 17 00:00:00 2001
From: Peter Dave Hello <hsu@peterdavehello.org>
Date: Mon, 4 Oct 2021 22:09:48 +0800
Subject: [PATCH] Simplify GitLeaks install process (#2023)

---
 Dockerfile      | 14 +++++++-------
 Dockerfile-slim | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 12a982b7..3d1ffda8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,7 @@ FROM mvdan/shfmt:v3.4.0 as shfmt
 FROM accurics/terrascan:1.10.0 as terrascan
 FROM hadolint/hadolint:latest-alpine as dockerfile-lint
 FROM assignuser/chktex-alpine:v0.1.1 as chktex
+FROM zricethezav/gitleaks:v7.6.1 as gitleaks
 FROM garethr/kubeval:0.15.0 as kubeval
 FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib
 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
@@ -56,7 +57,6 @@ RUN apk add --no-cache \
     gcc \
     g++ \
     git git-lfs\
-    go \
     gnupg \
     icu-libs \
     jpeg-dev \
@@ -247,6 +247,11 @@ COPY --from=shfmt /bin/shfmt /usr/bin/
 ########################
 COPY --from=clang-format /usr/bin/clang-format /usr/bin/
 
+####################
+# Install GitLeaks #
+####################
+COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
+
 #################
 # Install Litnr #
 #################
@@ -321,12 +326,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repo
     && find /node_modules/ -type f -name 'LICENSE' -exec rm {} + \
     && find /node_modules/ -type f -name '*.md' -exec rm {} + \
     && find /node_modules/ -type f -name '*.txt' -exec rm {} + \
-    && find /usr/ -type f -name '*.md' -exec rm {} + \
-####################
-# Install GitLeaks #
-####################
-    && GO111MODULE=on go get github.com/zricethezav/gitleaks/v7 \
-    && mv /root/go/bin/gitleaks /usr/bin
+    && find /usr/ -type f -name '*.md' -exec rm {} +
 
 ################################################################################
 # Grab small clean image #######################################################
diff --git a/Dockerfile-slim b/Dockerfile-slim
index 991d3e6e..78205ce5 100644
--- a/Dockerfile-slim
+++ b/Dockerfile-slim
@@ -25,6 +25,7 @@ FROM mvdan/shfmt:v3.4.0 as shfmt
 FROM accurics/terrascan:1.10.0 as terrascan
 FROM hadolint/hadolint:latest-alpine as dockerfile-lint
 FROM assignuser/chktex-alpine:v0.1.1 as chktex
+FROM zricethezav/gitleaks:v7.6.1 as gitleaks
 FROM garethr/kubeval:0.15.0 as kubeval
 FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib
 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
@@ -55,7 +56,6 @@ RUN apk add --no-cache \
     gcc \
     g++ \
     git git-lfs\
-    go \
     gnupg \
     icu-libs \
     jpeg-dev \
@@ -185,6 +185,11 @@ COPY --from=shfmt /bin/shfmt /usr/bin/
 ########################
 COPY --from=clang-format /usr/bin/clang-format /usr/bin/
 
+####################
+# Install GitLeaks #
+####################
+COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
+
 #################
 # Install Litnr #
 #################
@@ -259,12 +264,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repo
     && find /node_modules/ -type f -name 'LICENSE' -exec rm {} + \
     && find /node_modules/ -type f -name '*.md' -exec rm {} + \
     && find /node_modules/ -type f -name '*.txt' -exec rm {} + \
-    && find /usr/ -type f -name '*.md' -exec rm {} + \
-####################
-# Install GitLeaks #
-####################
-    && GO111MODULE=on go get github.com/zricethezav/gitleaks/v7 \
-    && mv /root/go/bin/gitleaks /usr/bin
+    && find /usr/ -type f -name '*.md' -exec rm {} +
 
 ################################################################################
 # Grab small clean image #######################################################