UNCLASSIFIED

Commit 04cc1d98 authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'resolve-cve' into 'development'

Resolve CVE

See merge request !22
parents 238a1d95 87998f4d
Pipeline #275485 passed with stages
in 6 minutes and 41 seconds
...@@ -3,7 +3,9 @@ ARG BASE_IMAGE=ironbank/google/distroless/static ...@@ -3,7 +3,9 @@ ARG BASE_IMAGE=ironbank/google/distroless/static
ARG BASE_TAG=nonroot ARG BASE_TAG=nonroot
FROM gcr.io/kaniko-project/executor:v1.6.0-debug as upstream FROM gcr.io/kaniko-project/executor:v1.6.0-debug as upstream
FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.3 AS shell FROM registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal:8.4 AS shell
RUN microdnf update -y
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
{ {
"assignees": [ "extends": ["config:base"],
"@vickie.shen" "baseBranches": ["development"],
],
"baseBranches": [
"development"
],
"regexManagers": [ "regexManagers": [
{ {
"fileMatch": [ "fileMatch": ["^hardening_manifest.yaml$"],
"^Dockerfile$"
],
"matchStrings": [
"version=\"(?<currentValue>.*?)\""
],
"depNameTemplate": "gcr.io/kaniko-project/executor",
"datasourceTemplate": "docker"
},
{
"fileMatch": [
"^hardening_manifest.yaml$"
],
"matchStrings": [
"org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
],
"depNameTemplate": "gcr.io/kaniko-project/executor",
"datasourceTemplate": "docker"
},
{
"fileMatch": [
"^hardening_manifest.yaml$"
],
"matchStrings": [ "matchStrings": [
"tags:\\s+-\\s+\"(?<currentValue>.+?)\"" "tags:\\s+-\\s+\"(?<currentValue>.+?)\"",
"tag: .*:(?<currentValue>.*?)$",
"org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\"",
"url: docker://.*@(?<currentDigest>sha256:[a-f0-9]+)"
], ],
"depNameTemplate": "gcr.io/kaniko-project/executor", "depNameTemplate": "gcr.io/kaniko-project/executor",
"datasourceTemplate": "docker" "datasourceTemplate": "docker"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment