UNCLASSIFIED

Commit e42d381a authored by sean.melissari's avatar sean.melissari
Browse files

Merge branch 'development' into 'master'

development

See merge request !17
parents 66d96e41 d12eb163
Pipeline #184097 failed with stages
in 31 seconds
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.3 ARG BASE_TAG=8.3
FROM istio/operator:1.7.6 AS base FROM istio/operator:1.7.7 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
...@@ -8,7 +8,7 @@ name: "opensource/istio-1.7/operator-1.7" ...@@ -8,7 +8,7 @@ name: "opensource/istio-1.7/operator-1.7"
# 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.7.6" - "1.7.7"
- "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://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: "opensource" org.opencontainers.image.vendor: "opensource"
org.opencontainers.image.version: "1.7.6" org.opencontainers.image.version: "1.7.7"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "istio" mil.dso.ironbank.image.keywords: "istio"
## 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/operator:1.7.6 - tag: istio/operator:1.7.7
url: docker://docker.io/istio/operator@sha256:62fa2b255ecda63ef6a4d55dcfd27ac88c5d49cda52b2e1b464ff481fbcfe88a url: docker://docker.io/istio/operator@sha256:48dec85504333d42935c6c0bcc89cf35e33b300f954175d4c14993f074d6d821
# List of project maintainers # List of project maintainers
# FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Fill in the following details for the current container owner in the whitelist
......
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