UNCLASSIFIED

Commit 999037a1 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

bump 1.7.5

See merge request !13
parents 82fbc377 8142a023
Pipeline #110318 failed with stages
in 30 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/pilot:1.7.4 AS base FROM istio/pilot:1.7.5 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="pilot" \ ...@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="pilot" \
org.opencontainers.image.description="Istio Pilot provides traffic management capabilities in the Istio Service mesh." \ org.opencontainers.image.description="Istio Pilot provides traffic management capabilities in the Istio Service 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.7.4" \ org.opencontainers.image.version="1.7.5" \
maintainer="cht@dsop.io" maintainer="cht@dsop.io"
COPY --from=base /usr/local/bin/pilot-discovery /usr/local/bin/ COPY --from=base /usr/local/bin/pilot-discovery /usr/local/bin/
......
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "1.7.4") dccscrPipeline(version: "1.7.5")
\ No newline at end of file \ No newline at end of file
--- ---
special-image-path: opensource/istio/pilot special-image-path: opensource/istio/pilot
resources: resources:
- url: "docker://docker.io/istio/pilot@sha256:ec938bebb957478188f35885a33cd713c595e719ae0b52d4f5c25e4426100323" - url: "docker://docker.io/istio/pilot@sha256:e75fc7e38c084b7755470c4bc7dd8baee41234dc53834d63d343ad1345e5998b"
tag: "istio/pilot:1.7.4" tag: "istio/pilot:1.7.5"
\ 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