Simplify GitLeaks install process (#2023)

This commit is contained in:
Peter Dave Hello 2021-10-04 22:09:48 +08:00 committed by GitHub
parent 71bdd6fe59
commit 572f93466a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions

View file

@ -19,6 +19,7 @@ FROM mvdan/shfmt:v3.4.0 as shfmt
FROM accurics/terrascan:1.10.0 as terrascan FROM accurics/terrascan:1.10.0 as terrascan
FROM hadolint/hadolint:latest-alpine as dockerfile-lint FROM hadolint/hadolint:latest-alpine as dockerfile-lint
FROM assignuser/chktex-alpine:v0.1.1 as chktex 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 garethr/kubeval:0.15.0 as kubeval
FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib 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 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
@ -56,7 +57,6 @@ RUN apk add --no-cache \
gcc \ gcc \
g++ \ g++ \
git git-lfs\ git git-lfs\
go \
gnupg \ gnupg \
icu-libs \ icu-libs \
jpeg-dev \ jpeg-dev \
@ -247,6 +247,11 @@ COPY --from=shfmt /bin/shfmt /usr/bin/
######################## ########################
COPY --from=clang-format /usr/bin/clang-format /usr/bin/ COPY --from=clang-format /usr/bin/clang-format /usr/bin/
####################
# Install GitLeaks #
####################
COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
################# #################
# Install Litnr # # 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 'LICENSE' -exec rm {} + \
&& find /node_modules/ -type f -name '*.md' -exec rm {} + \ && find /node_modules/ -type f -name '*.md' -exec rm {} + \
&& find /node_modules/ -type f -name '*.txt' -exec rm {} + \ && find /node_modules/ -type f -name '*.txt' -exec rm {} + \
&& find /usr/ -type f -name '*.md' -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
################################################################################ ################################################################################
# Grab small clean image ####################################################### # Grab small clean image #######################################################

View file

@ -25,6 +25,7 @@ FROM mvdan/shfmt:v3.4.0 as shfmt
FROM accurics/terrascan:1.10.0 as terrascan FROM accurics/terrascan:1.10.0 as terrascan
FROM hadolint/hadolint:latest-alpine as dockerfile-lint FROM hadolint/hadolint:latest-alpine as dockerfile-lint
FROM assignuser/chktex-alpine:v0.1.1 as chktex 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 garethr/kubeval:0.15.0 as kubeval
FROM ghcr.io/assignuser/lintr-lib:0.3.0 as lintr-lib 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 FROM ghcr.io/awkbar-devops/clang-format:v1.0.2 as clang-format
@ -55,7 +56,6 @@ RUN apk add --no-cache \
gcc \ gcc \
g++ \ g++ \
git git-lfs\ git git-lfs\
go \
gnupg \ gnupg \
icu-libs \ icu-libs \
jpeg-dev \ jpeg-dev \
@ -185,6 +185,11 @@ COPY --from=shfmt /bin/shfmt /usr/bin/
######################## ########################
COPY --from=clang-format /usr/bin/clang-format /usr/bin/ COPY --from=clang-format /usr/bin/clang-format /usr/bin/
####################
# Install GitLeaks #
####################
COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
################# #################
# Install Litnr # # 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 'LICENSE' -exec rm {} + \
&& find /node_modules/ -type f -name '*.md' -exec rm {} + \ && find /node_modules/ -type f -name '*.md' -exec rm {} + \
&& find /node_modules/ -type f -name '*.txt' -exec rm {} + \ && find /node_modules/ -type f -name '*.txt' -exec rm {} + \
&& find /usr/ -type f -name '*.md' -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
################################################################################ ################################################################################
# Grab small clean image ####################################################### # Grab small clean image #######################################################