Merge pull request #328 from cyberark/update-rh-base-image

Update RH base image to UBI
cyberark · Jun 4, 2021 · 53271bd · 53271bd
2 parents 17c4b3d + 85e4985
commit 53271bd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
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]
 
+### Changed
+- Update RH base image to `ubi8/ubi` instead of `rhel7/rhel`.
+  [PR cyberark/secrets-provider-for-k8s#328](https://github.com/cyberark/secrets-provider-for-k8s/pull/328)
+
 ## [1.1.3] - 2021-03-01
 
 ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -118,7 +118,7 @@ CMD ["/usr/local/bin/dlv",  \
      "/usr/local/bin/secrets-provider"]
 
 # =================== MAIN CONTAINER (REDHAT) ===================
-FROM registry.access.redhat.com/rhel as secrets-provider-for-k8s-redhat
+FROM registry.access.redhat.com/ubi8/ubi as secrets-provider-for-k8s-redhat
 MAINTAINER CyberArk Software Ltd.
 
 ARG VERSION

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -79,6 +79,17 @@ pipeline {
                 scanAndReport("secrets-provider-for-k8s:latest", "NONE", true)
               }
             }
+            stage('Scan RedHat image for fixable issues') {
+              steps {
+                scanAndReport("secrets-provider-for-k8s-redhat:latest", "HIGH", false)
+              }
+            }
+
+            stage('Scan RedHat image for all issues') {
+              steps {
+                scanAndReport("secrets-provider-for-k8s-redhat:latest", "NONE", true)
+              }
+            }
           }
         }
 

diff --git a/bin/build b/bin/build
@@ -48,6 +48,7 @@ else
      --build-arg TAG=$(git_tag) \
      --build-arg VERSION="$FULL_VERSION_TAG" \
      --tag "secrets-provider-for-k8s-redhat:${FULL_VERSION_TAG}" \
+     --tag "secrets-provider-for-k8s-redhat:latest" \
      --target "secrets-provider-for-k8s-redhat" \
      .
 fi