UNCLASSIFIED

Skip to content

GitLab

Commit 149967f8 authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch 'development' into 'blake.burkhart-development-patch-14147' 

# Conflicts:
#   Dockerfile
parents a5436c26 8552aebe
Pipeline #231077 failed with stages
in 6 minutes and 54 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
hardening_manifest.yaml
View file @ 149967f8
...@@ -8,7 +8,7 @@ name: "opensource/istio/proxyv2" ...@@ -8,7 +8,7 @@ name: "opensource/istio/proxyv2"
# 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:
- "1.9.2" - "1.9.3"
- "1.9" - "1.9"
# 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://istio.io/" org.opencontainers.image.url: "https://istio.io/"
# Name of the distributing entity, organization or individual # Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "istio" org.opencontainers.image.vendor: "istio"
org.opencontainers.image.version: "1.9.2" org.opencontainers.image.version: "1.9.3"
# Keywords to help with search (ex. "cicd,gitops,golang") # Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "proxy,servicemesh" mil.dso.ironbank.image.keywords: "proxy,servicemesh"
# 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: istio/proxyv2:1.9.2 - tag: istio/proxyv2:1.9.3
url: docker://docker.io/istio/proxyv2@sha256:ee9c153e2f973937befb8af61e7269ab368020b6e7d91b5d891bbbeba55eb266 url: docker://docker.io/istio/proxyv2@sha256:1ffc6699431d779ec4ab8a97e592e4713fa06aa3608bb1b06bc923a61a3f141d
# 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