From a2ce770d44780cee1aebde4247c3d10187a3d842 Mon Sep 17 00:00:00 2001 From: renovate Date: Tue, 18 May 2021 01:15:38 +0000 Subject: [PATCH 1/4] Update renovate/renovate Docker tag to v25.21.12 --- Dockerfile | 2 +- hardening_manifest.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 91cad7a..ed97f2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs14 ARG BASE_TAG=14.15.5 -FROM renovate/renovate:25.21.11-slim as builder +FROM renovate/renovate:25.21.12-slim as builder FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b2918f5..e0b4b61 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "container-hardening-tools/renovate/renovate" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "25.21.11" +- "25.21.12" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://github.com/renovatebot/renovate" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "WhiteSource" - org.opencontainers.image.version: "25.21.11" + org.opencontainers.image.version: "25.21.12" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "automation,dependency,updates" ## This value can be "opensource" or "commercial" @@ -37,8 +37,8 @@ labels: # List of resources to make available to the offline build context resources: -- tag: renovate/renovate:25.21.11-slim - url: docker://docker.io/renovate/renovate@sha256:64a443248fb82639515f2475d0d6d2d9bc350089a86929a31dbe371c1648198d +- tag: renovate/renovate:25.21.12-slim + url: docker://docker.io/renovate/renovate@sha256:2a219d19593503177dcd2c33136f7fd4de12657059c2acbaa405e53551a16041 - filename: helm-docs.tar.gz url: https://github.com/norwoodj/helm-docs/releases/download/v1.5.0/helm-docs_1.5.0_Linux_x86_64.tar.gz validation: -- GitLab From 8c4355e68bc7174c15d25e72de8c838030e7bd46 Mon Sep 17 00:00:00 2001 From: renovate Date: Wed, 19 May 2021 04:13:03 +0000 Subject: [PATCH 2/4] Update renovate/renovate:25.21.12-slim Docker digest to f912b21 --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e0b4b61..d6513c0 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -38,7 +38,7 @@ labels: # List of resources to make available to the offline build context resources: - tag: renovate/renovate:25.21.12-slim - url: docker://docker.io/renovate/renovate@sha256:2a219d19593503177dcd2c33136f7fd4de12657059c2acbaa405e53551a16041 + url: docker://docker.io/renovate/renovate@sha256:f912b21f96815f9cc7b686f0985407221eec47816d457755863d4dc67b59e9cd - filename: helm-docs.tar.gz url: https://github.com/norwoodj/helm-docs/releases/download/v1.5.0/helm-docs_1.5.0_Linux_x86_64.tar.gz validation: -- GitLab From 2629c9a8eddd1c4ff1a39f36ac335aed1fdb7755 Mon Sep 17 00:00:00 2001 From: renovate Date: Sun, 23 May 2021 01:15:34 +0000 Subject: [PATCH 3/4] Update renovate/renovate Docker tag to v25.29.0 --- Dockerfile | 2 +- hardening_manifest.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed97f2a..f52d60c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs14 ARG BASE_TAG=14.15.5 -FROM renovate/renovate:25.21.12-slim as builder +FROM renovate/renovate:25.29.0-slim as builder FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d6513c0..1f3e2ef 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "container-hardening-tools/renovate/renovate" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "25.21.12" +- "25.29.0" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://github.com/renovatebot/renovate" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "WhiteSource" - org.opencontainers.image.version: "25.21.12" + org.opencontainers.image.version: "25.29.0" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "automation,dependency,updates" ## This value can be "opensource" or "commercial" @@ -37,8 +37,8 @@ labels: # List of resources to make available to the offline build context resources: -- tag: renovate/renovate:25.21.12-slim - url: docker://docker.io/renovate/renovate@sha256:f912b21f96815f9cc7b686f0985407221eec47816d457755863d4dc67b59e9cd +- tag: renovate/renovate:25.29.0-slim + url: docker://docker.io/renovate/renovate@sha256:45ca764b8773fdd6e5dd8d0444acef224f6c1e5b3daa9b326bedc21371ab7c76 - filename: helm-docs.tar.gz url: https://github.com/norwoodj/helm-docs/releases/download/v1.5.0/helm-docs_1.5.0_Linux_x86_64.tar.gz validation: -- GitLab From ee141fd9220cb96f3b6d63114399514ae6c15631 Mon Sep 17 00:00:00 2001 From: Zachary Sanders Date: Mon, 24 May 2021 08:52:48 -0600 Subject: [PATCH 4/4] update readme --- README.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index 7890de1..74bd6b0 100644 --- a/README.md +++ b/README.md @@ -87,16 +87,7 @@ The example `renovate.json` below will update the **tags:** and **labels:** stri "^hardening_manifest.yaml$" ], "matchStrings": [ - "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" - ], - "depNameTemplate": "argoproj/argocd", - "datasourceTemplate": "docker" - }, - { - "fileMatch": [ - "^hardening_manifest.yaml$" - ], - "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"", "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "argoproj/argocd", -- GitLab