UNCLASSIFIED

Skip to content

GitLab

Commit 7af91855 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master' 

Development

See merge request !33
parents d440e27e 6547c304
Pipeline #444179 passed with stages
in 15 minutes and 52 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
Dockerfile
View file @ 7af91855
...@@ -3,13 +3,13 @@ ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ...@@ -3,13 +3,13 @@ ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.4 ARG BASE_TAG=8.4
# Updated by Renovate # Updated by Renovate
ARG version="1.9.7" ARG version="1.9.8"
FROM istio/proxyv2:${version} AS base FROM istio/proxyv2:${version} AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ARG version="1.9.7" ARG version="1.9.8"
# Environment variable indicating the exact proxy sha - for debugging or version-specific configs # Environment variable indicating the exact proxy sha - for debugging or version-specific configs
# Iron Bank cannot provide a meaningful SHA here, set it to a placeholder value # Iron Bank cannot provide a meaningful SHA here, set it to a placeholder value
......
hardening_manifest.yaml
View file @ 7af91855
...@@ -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.7" - "1.9.8"
- "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.7" org.opencontainers.image.version: "1.9.8"
# 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.7 - tag: istio/proxyv2:1.9.8
url: docker://docker.io/istio/proxyv2@sha256:48846a36a6fe714270a15ab1de172bcf90547f62f6b0cd66bcf4adbc20d7722b url: docker://docker.io/istio/proxyv2@sha256:28ac85b69bc58c181f2d717ed9daea370161bca9c596e215f9146384c47e29c5
# 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