From 0471fa4d112e63975900359d945f1325daaa9f76 Mon Sep 17 00:00:00 2001
From: Sean Melissari <Melissari_Sean@bah.com>
Date: Thu, 18 Jun 2020 10:47:50 -0400
Subject: [PATCH] add renovate

---
 Dockerfile    | 22 +++++++++-------------
 Jenkinsfile   |  2 +-
 download.yaml |  2 +-
 renovate.json | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 renovate.json

diff --git a/Dockerfile b/Dockerfile
index ca1f9fd..5a63740 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,19 @@
-###############################################################
-# Default registry variables
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
-###############################################################
-FROM opensource/istio/operator/operator:1.6.1 AS base
+
+FROM istio/operator:1.6.1 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-# Provide label information
-LABEL name="istio-operator" \
-      maintainer="cody.hutchins@darkwolf.co" \
-      vendor="Open Source" \
-      version="1.6.1" \
-      release="1" \
-      summary="Operator for Istio" \
-      description="The istio-operator allows you to package, deploy, and manage Istio in Kubernetes"
 
-COPY --from=base /usr/local/bin/operator /usr/local/bin/operator
+LABEL org.opencontainers.image.title="istio-operator" \
+      org.opencontainers.image.description="The istio-operator allows you to package, deploy, and manage Istio in Kubernetes." \
+      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/operator /usr/local/bin/operator
 COPY --from=base /var/lib/istio/manifests/ /var/lib/istio/manifests/
 
 USER 1001
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 b8a4596..4537d8a 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,4 +1,4 @@
 ---
 resources:
   - url: "docker://docker.io/istio/operator@sha256:8fba2ac670f38ca768966c6789d044039f30cca4de372d073f7e64e7245e671c"
-    tag: "opensource/istio/operator/operator:1.6.1"
+    tag: "istio/operator:1.6.1"
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..36481c6
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,32 @@
+{
+  "assignees": ["@gavin.scallon"],
+  "baseBranches": ["development"],
+  "packageRules": [
+    {
+      "datasources": ["docker"],
+      "packageNames": ["istio/operator"],
+      "separateMinorPatch": true,
+      "minor": {
+        "enabled": false
+      }
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": ["^Dockerfile$"],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/operator",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^Jenkinsfile$"],
+      "matchStrings": [
+        "version:\\s+\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/operator",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}
-- 
GitLab