UNCLASSIFIED

Commit 82fbc377 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

bump 1.7.4

See merge request !11
parents 34693efa b5e8c8bb
Pipeline #81060 failed with stages
in 79 minutes and 26 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.3 AS base FROM istio/pilot:1.7.4 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -10,11 +10,10 @@ LABEL org.opencontainers.image.title="pilot" \ ...@@ -10,11 +10,10 @@ 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.3" \ org.opencontainers.image.version="1.7.4" \
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/
COPY --from=base /cacert.pem /cacert.pem
EXPOSE 80 443 EXPOSE 80 443
USER 1001 USER 1001
......
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "1.7.3") dccscrPipeline(version: "1.7.4")
\ 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:ba83d2a63ef324eb14128d0804aea5d1170b43ca532823dd186a516d354be610" - url: "docker://docker.io/istio/pilot@sha256:ec938bebb957478188f35885a33cd713c595e719ae0b52d4f5c25e4426100323"
tag: "istio/pilot:1.7.3" tag: "istio/pilot:1.7.4"
\ 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