Merge pull request #1423 from cyberark/bump-alpine

cyberark · Aug 19, 2021 · 26b8c7b · 26b8c7b
2 parents dd9e1b6 + 758e480
commit 26b8c7b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+- Secretless and secretless-redhat containers now use Alpine 3.14 as their base
+  image. [PR cyberark/secretless-broker#1423](https://github.com/cyberark/secretless-broker/pull/1423)
+
 ## [1.7.5] - 2021-08-04
 
 ### Security

diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ RUN go build -ldflags="-X github.com/cyberark/secretless-broker/pkg/secretless.T
 
 
 # =================== MAIN CONTAINER ===================
-FROM alpine:3.12 as secretless-broker
+FROM alpine:3.14 as secretless-broker
 MAINTAINER CyberArk Software Ltd.
 
 RUN apk add -u shadow libc6-compat openssl && \

diff --git a/Dockerfile.debug b/Dockerfile.debug
@@ -35,7 +35,7 @@ RUN go build -ldflags="-X github.com/cyberark/secretless-broker/pkg/secretless.T
 
 
 # =================== MAIN CONTAINER ===================
-FROM alpine:3.12 as secretless-broker
+FROM alpine:3.14 as secretless-broker
 MAINTAINER CyberArk Software Ltd.
 
 RUN apk add -u shadow libc6-compat && \

diff --git a/bin/run_gosec b/bin/run_gosec
@@ -52,7 +52,7 @@ modified_directories="./..."
 if [[ ${current_branch} != 'main' ]]; then 
     echo 'Current branch is not main - running gosec on modified packages for this branch only'
     git fetch origin main:refs/remotes/origin/main
-    modified_directories=($(git diff origin/main...origin/"${current_branch}" --name-only | xargs -L1 dirname | uniq))
+    modified_directories=($(git diff origin/main...origin/"${current_branch}" --name-only | xargs -L1 sh -c '[ "$#" -gt 0 ] && dirname "$@"' - | uniq))
 fi
 
 # Remove output file just in case it exists