UNCLASSIFIED

Skip to content

GitLab

Commit be38b95a authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master' 

bump v2.25.2

See merge request !37
parents 2610501a 1be9c1ff
Pipeline #218349 passed with stages
in 40 minutes and 24 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ be38b95a
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
ARG BASE_IMAGE=ubi8 ARG BASE_IMAGE=ubi8
ARG BASE_TAG=8.2 ARG BASE_TAG=8.2
FROM prom/prometheus:v2.25.0 as base FROM prom/prometheus:v2.25.2 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ be38b95a
...@@ -8,7 +8,7 @@ name: "opensource/prometheus/prometheus" ...@@ -8,7 +8,7 @@ name: "opensource/prometheus/prometheus"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "v2.25.0" - "v2.25.2"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://prometheus.io/" org.opencontainers.image.url: "https://prometheus.io/"
# Name of the distributing entity, organization or individual # Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Cloud Native Computing Foundation" org.opencontainers.image.vendor: "Cloud Native Computing Foundation"
org.opencontainers.image.version: "v2.25.0" org.opencontainers.image.version: "v2.25.2"
# Keywords to help with search (ex. "cicd,gitops,golang") # Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "prometheus,metrics,analytics,collect" mil.dso.ironbank.image.keywords: "prometheus,metrics,analytics,collect"
# This value can be "opensource" or "commercial" # This value can be "opensource" or "commercial"
...@@ -37,8 +37,8 @@ labels: ...@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- tag: prom/prometheus:v2.25.0 - tag: prom/prometheus:v2.25.2
url: docker://docker.io/prom/prometheus@sha256:e13550c4680834dbbc84d8bc2661e6b9dc10ee184ed8c846a2092e1929c2de8e url: docker://docker.io/prom/prometheus@sha256:e835738ffc78306f6b7b018a9ee07b2f91d56f64d5096203b8c0113fea0485d0
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
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

UNCLASSIFIED