Merge branch 'development' into 'master'

bump 1.6.12 See merge request !22

Merge branch 'development' into 'master'
bump 1.6.12 See merge request !22
e0287a8d · Andy Maksymowicz · 6ac38959 · 27ec7b63 · e0287a8d · e0287a8d
Commit e0287a8d authored Oct 14, 2020 by Andy Maksymowicz
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.10 AS base
+FROM istio/mixer:1.6.12 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.10" \
+      org.opencontainers.image.version="1.6.12" \
      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.10")
+dccscrPipeline(version: "1.6.12")
--- a/download.yaml
+++ b/download.yaml
 ---
 resources:
-  - url: "docker://docker.io/istio/mixer@sha256:daeed7f6de24d54fc05c658ecde6ad43efcd46adc829e1541a41e1ad4fe5aa87"
+  - url: "docker://docker.io/istio/mixer@sha256:03b54f46e7c5d628b1adf46e1c4c521ec9e1977bec1dc97a8637ea5ceb7d6274"
-    tag: "istio/mixer:1.6.10"
+    tag: "istio/mixer:1.6.12"