diff --git a/Dockerfile b/Dockerfile index ca1f9fd31af179420147838668820f4b6d861466..5a637402a131ba837378d3541fa7ac030c3dcde4 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 c536db007cdd4fe920d2158a2fe1a3866b75d6ba..8916a8470a265a0baf5e5092bc6cafe105e5b048 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 b8a4596378a502ec5b5dc0c3d6c0ca3ff0a97298..4537d8a4c0230efbca70d70375e06d4191840f59 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 0000000000000000000000000000000000000000..36481c66b573d68c40db1b9e6cd4df2353841d2e --- /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=\"(?.*?)\"" + ], + "depNameTemplate": "istio/operator", + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["^Jenkinsfile$"], + "matchStrings": [ + "version:\\s+\"(?.*?)\"" + ], + "depNameTemplate": "istio/operator", + "datasourceTemplate": "docker" + } + ] +}