UNCLASSIFIED

Commit 5dc464d3 authored by sean.melissari's avatar sean.melissari
Browse files

Merge branch 'renovate/docker-istio-install-cni-1.6.x' into 'development'

Update istio/install-cni Docker tag to v1.6.14

See merge request !24
parents 21d3c9d5 f64f29a1
Pipeline #90785 passed with stages
in 35 minutes and 55 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.2 ARG BASE_TAG=8.2
FROM istio/install-cni:1.6.13 AS base FROM istio/install-cni:1.6.14 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="install-cni" \ ...@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="install-cni" \
org.opencontainers.image.description="Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." \ org.opencontainers.image.description="Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." \
org.opencontainers.image.licenses="Apache-2.0" \ org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.url="https://istio.io" \ org.opencontainers.image.url="https://istio.io" \
org.opencontainers.image.version="1.6.13" \ org.opencontainers.image.version="1.6.14" \
maintainer="cht@dsop.io" maintainer="cht@dsop.io"
COPY --from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/ COPY --from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/
......
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "1.6.13") dccscrPipeline(version: "1.6.14")
--- ---
resources: resources:
- url: "docker://docker.io/istio/install-cni@sha256:b822e2cec2fd2646905f48b8a90f3ab835d5c1afbc1173243108d43616872998" - url: "docker://docker.io/istio/install-cni@sha256:b1d66e0f4b72fea7b54857db6103d555e6822dd71d30b0c1fcf0f5f59a7d2f4f"
tag: "istio/install-cni:1.6.13" tag: "istio/install-cni:1.6.14"
\ No newline at end of file \ No newline at end of file
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