UNCLASSIFIED

Commit 1563d40d authored by riveraj's avatar riveraj
Browse files

Merge branch 'development' into 'master'

Merge Development to Master

See merge request !15
parents fd91f3f8 447bae48
Pipeline #429215 passed with stages
in 16 minutes and 15 seconds
......@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.4
FROM quay.io/coreos/clair:v4.1.2 as base
FROM quay.io/coreos/clair:v4.2.0 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build
......
......@@ -8,7 +8,7 @@ name: "opensource/quay/clair"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "v4.1.2"
- "v4.2.0"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://github.com/quay/clair"
# Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Red Hat"
org.opencontainers.image.version: "v4.1.2"
org.opencontainers.image.version: "v4.2.0"
# Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "security,scanning,container"
# This value can be "opensource" or "commercial"
......@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context
resources:
- tag: quay.io/coreos/clair:v4.1.2
url: docker://quay.io/coreos/clair@sha256:e4667dcbe275cf6cd40720f4d2903685f8b3825af20987e4233d658b4080ccc4
- tag: quay.io/coreos/clair:v4.2.0
url: docker://quay.io/coreos/clair@sha256:9c1b84b56dd48a3b174342d9ce3929dd4992a6eb62029500fc444c28afef352a
- filename: musl.tar.gz
url: https://musl.libc.org/releases/musl-1.2.0.tar.gz
validation:
......
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