Update entrypoint (#1013)

* Update entrypoint. * update comment. * Call each extra arg on its own. * Update loop. * Update extra args. * Use miccah's magic script. * Fix path to bash. * update entrypoint. * Add bash to Dockerfile. * update goreleaser dockerfile.
trufflesecurity · Jan 12, 2023 · 477e2a1 · 477e2a1
1 parent 430d5c7
commit 477e2a1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN  --mount=type=cache,target=/go/pkg/mod \
      GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o trufflehog .
 
 FROM alpine:3.15
-RUN apk add --no-cache git ca-certificates \
+RUN apk add --no-cache bash git ca-certificates \
     && rm -rf /var/cache/apk/* && \
     update-ca-certificates
 COPY --from=builder /build/trufflehog /usr/bin/trufflehog

diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser
@@ -1,6 +1,6 @@
 FROM alpine:3.15
 
-RUN apk add --no-cache git ca-certificates \
+RUN apk add --no-cache bash git ca-certificates \
     && rm -rf /var/cache/apk/* && \
     update-ca-certificates
 WORKDIR /usr/bin/

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,5 +1,6 @@
-#!/usr/bin/env ash
+#!/usr/bin/env bash
 
-# `$*` expands the `args` supplied in an `array` individually
-# or splits `args` in a string separated by whitespace.
-/usr/bin/trufflehog $*
+# Parse the last argument into an array of extra_args.
+mapfile -t extra_args < <(bash -c "for arg in ${*: -1}; do echo \$arg; done")
+
+/usr/bin/trufflehog "${@: 1: $#-1}" "${extra_args[@]}"