UNCLASSIFIED

Commit 1388bd33 authored by sean.melissari's avatar sean.melissari
Browse files

Merge branch 'development' into 'master'

development

See merge request !15
parents f1df52ff c6807eba
Pipeline #184092 failed with stages
in 30 seconds
......@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.3
FROM istio/istioctl:1.7.6 AS base
FROM istio/istioctl:1.7.7 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
......@@ -8,7 +8,7 @@ name: "opensource/istio-1.7/istioctl-1.7"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "1.7.6"
- "1.7.7"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://istio.io/"
## Name of the distributing entity, organization or individual
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")
mil.dso.ironbank.image.keywords: "istio"
## 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: istio/istioctl:1.7.6
url: docker://docker.io/istio/istioctl@sha256:bfc6f38cacb3d28f0a4d816595972553ca258d9ca2deae30b7669983ea03f223
- tag: istio/istioctl:1.7.7
url: docker://docker.io/istio/istioctl@sha256:0f5da8324b916bb96cde6d9befb07c9a0ef311b2eba6acdde25ef82025046df4
# List of project maintainers
# 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