diff --git a/Dockerfile b/Dockerfile index b31221e3dbe4406cc2121244e7157930c9a009f2..6fd4bce98197dcf316bd56b5d66144727527910a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,18 @@ -############################################################### -# 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/install-cni/install-cni:1.6.1 AS base + +FROM istio/install-cni:1.6.3 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -# label information -LABEL name="istio install-cni" \ - maintainer="gavin.scallon@parsons.com" \ - vendor="Open Source" \ - version="1.6.1" \ - release="1" \ - summary="istio install-cni" \ - description="The Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." +LABEL org.opencontainers.image.title="install-cni" \ + org.opencontainers.image.description="Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.url="https://istio.io" \ + org.opencontainers.image.version="1.6.3" \ + maintainer="cht@dsop.io" + COPY jq-linux64 / COPY --from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/ COPY --from=base /install-cni.sh /filter.jq / diff --git a/Jenkinsfile b/Jenkinsfile index c536db007cdd4fe920d2158a2fe1a3866b75d6ba..3a790e45fdafb921820b4715926bbb2f05f65adf 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.3") diff --git a/README.md b/README.md index 25a98056b4447097fb9397841a96b847f701019a..d78decd73a7a4d67747fdee89122296d19fa0cd6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # install-cni -Version 1.6.1 - ``` # Download the tarball from the Iron Bank repository and navigate to the # download directory. Run the following commands to run the container @@ -23,4 +21,4 @@ that the chart is modified to utilize the install-cni image from the Iron Bank. ## Notes -The container is configured to run as user 1001. \ No newline at end of file +The container is configured to run as user 1001. diff --git a/download.yaml b/download.yaml index 09e16c581188c07c27337b40e5755d2b451c6f23..d01210e1b1af51b33c9ebe990aa2b5e858607745 100644 --- a/download.yaml +++ b/download.yaml @@ -1,7 +1,7 @@ --- resources: - - url: "docker://docker.io/istio/install-cni@sha256:895d484eeb7de4cbb0dcdff754a3581570459af5b2d563d3301740843ae379b2" - tag: opensource/istio/install-cni/install-cni:1.6.1 + - url: "docker://docker.io/istio/install-cni@sha256:5e29ba9d79fdbc63044ddd2a067ca37f835c7ebb38685f65d883ce781f938ccf" + tag: "istio/install-cni:1.6.3" - url: https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 filename: jq-linux64 validation: diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000000000000000000000000000000000..196859f07990a740969b63afd3f15ca9b8a09d9c --- /dev/null +++ b/renovate.json @@ -0,0 +1,32 @@ +{ + "assignees": ["@gavin.scallon"], + "baseBranches": ["development"], + "packageRules": [ + { + "datasources": ["docker"], + "packageNames": ["istio/install-cni"], + "separateMinorPatch": true, + "minor": { + "enabled": false + } + } + ], + "regexManagers": [ + { + "fileMatch": ["^Dockerfile$"], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "istio/install-cni", + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["^Jenkinsfile$"], + "matchStrings": [ + "version:\\s+\"(?.*?)\"" + ], + "depNameTemplate": "istio/install-cni", + "datasourceTemplate": "docker" + } + ] +}