Merge branch 'development' into 'master'

bump 1.6.13 See merge request !24

Merge branch 'development' into 'master'
bump 1.6.13 See merge request !24
3fb036de · Al Fontaine · e0287a8d · 59159352 · 3fb036de · 3fb036de
Commit 3fb036de authored Oct 29, 2020 by Al Fontaine
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Dockerfile Dockerfile +2 -2

Jenkinsfile Jenkinsfile +1 -1

download.yaml download.yaml +2 -2

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
-FROM istio/mixer:1.6.12 AS base
+FROM istio/mixer:1.6.13 AS base
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="mixer" \
      org.opencontainers.image.description="Mixer provides policy controls and telemetry collection." \
      org.opencontainers.image.licenses="Apache-2.0" \
      org.opencontainers.image.url="https://istio.io" \
-      org.opencontainers.image.version="1.6.12" \
+      org.opencontainers.image.version="1.6.13" \
      maintainer="cht@dsop.io"
 COPY --from=base /usr/local/bin/mixs /usr/local/bin/mixs

--- a/Jenkinsfile
+++ b/Jenkinsfile
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "1.6.12")
+dccscrPipeline(version: "1.6.13")
--- a/download.yaml
+++ b/download.yaml
 ---
 resources:
-  - url: "docker://docker.io/istio/mixer@sha256:03b54f46e7c5d628b1adf46e1c4c521ec9e1977bec1dc97a8637ea5ceb7d6274"
+  - url: "docker://docker.io/istio/mixer@sha256:fe2e1ec5807d1cb0171681b8dea303a282f18bce2caca892653f70ec14bb9823"
-    tag: "istio/mixer:1.6.12"
+    tag: "istio/mixer:1.6.13"