From 3b810263960f28c0e58810450735ebc1dd3674ae Mon Sep 17 00:00:00 2001
From: Sean Melissari <Melissari_Sean@bah.com>
Date: Thu, 18 Jun 2020 09:59:10 -0400
Subject: [PATCH 1/2] add renovate

---
 Dockerfile    | 31 +++++++++++++------------------
 Jenkinsfile   |  2 +-
 download.yaml |  2 +-
 renovate.json | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 renovate.json

diff --git a/Dockerfile b/Dockerfile
index bac7ee3..96ccc52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,23 @@
-###############################################################
-# Default registry variables
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
-###############################################################
-# Copy mixer contents to base image
-FROM opensource/istio/mixer/mixer:1.6.1 AS base
+
+FROM istio/mixer:1.6.1 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
+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.1" \
+      maintainer="cht@dsop.io"
+
 COPY --from=base /usr/local/bin/mixs /usr/local/bin/mixs
-###############################################################
-# Provide label information
-LABEL name="istio-mixer" \
-      maintainer="gavin.scallon@parsons.com" \
-      vendor="Open Source" \
-      version="1.6.1" \
-      release="1" \
-      summary="Mixer provides policy controls and telemetry collection" \
-      description="Provides backend abstraction and intermediation"
 
-###############################################################
-# Run as non-root user, provide healthcheck and entrypoint/cmd
-ENTRYPOINT ["/usr/local/bin/mixs", "server"]
 USER 1001
+
 HEALTHCHECK --interval=1m --start-period=30s CMD mixs server --help
-CMD [ "--configStoreURL=fs:///etc/opt/mixer/configroot","--configStoreURL=k8s://" ]
\ No newline at end of file
+
+ENTRYPOINT ["/usr/local/bin/mixs", "server"]
+CMD [ "--configStoreURL=fs:///etc/opt/mixer/configroot","--configStoreURL=k8s://" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index c536db0..8916a84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline( version: "1.6.1")
\ No newline at end of file
+dccscrPipeline(version: "1.6.1")
diff --git a/download.yaml b/download.yaml
index 49d8d36..fabb38d 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,4 +1,4 @@
 ---
 resources:
   - url: "docker://docker.io/istio/mixer@sha256:c5c5d32773b3c6f39ca24420528213a3f084e39d013bbeb21fad1d7454aa2af0"
-    tag: "opensource/istio/mixer/mixer:1.6.1"
+    tag: "istio/mixer:1.6.1"
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..031f440
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,32 @@
+{
+  "assignees": ["@gavin.scallon"],
+  "baseBranches": ["development"],
+  "packageRules": [
+    {
+      "datasources": ["docker"],
+      "packageNames": ["istio/mixer"],
+      "separateMinorPatch": true,
+      "minor": {
+        "enabled": false
+      }
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": ["^Dockerfile$"],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/mixer",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^Jenkinsfile$"],
+      "matchStrings": [
+        "version:\\s+\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/mixer",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}
-- 
GitLab


From 2b12e84039938731c731620d297706fb86b6a5e2 Mon Sep 17 00:00:00 2001
From: renovate <renovate@support.dsop.io>
Date: Fri, 19 Jun 2020 00:04:16 +0000
Subject: [PATCH 2/2] Update istio/mixer Docker tag to v1.6.3

---
 Dockerfile    | 4 ++--
 Jenkinsfile   | 2 +-
 download.yaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 96ccc52..bbc3050 100644
--- 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.1 AS base
+FROM istio/mixer:1.6.3 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.1" \
+      org.opencontainers.image.version="1.6.3" \
       maintainer="cht@dsop.io"
 
 COPY --from=base /usr/local/bin/mixs /usr/local/bin/mixs
diff --git a/Jenkinsfile b/Jenkinsfile
index 8916a84..3a790e4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "1.6.1")
+dccscrPipeline(version: "1.6.3")
diff --git a/download.yaml b/download.yaml
index fabb38d..4c0ec1c 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,4 +1,4 @@
 ---
 resources:
-  - url: "docker://docker.io/istio/mixer@sha256:c5c5d32773b3c6f39ca24420528213a3f084e39d013bbeb21fad1d7454aa2af0"
-    tag: "istio/mixer:1.6.1"
+  - url: "docker://docker.io/istio/mixer@sha256:25f1e28a3548c8a69172d6544124b4a2ec8fc3e69ca820f678896879f29b05c3"
+    tag: "istio/mixer:1.6.3"
-- 
GitLab