From 871141e2475ab7281b224ba9f636ce3a5c6c89af Mon Sep 17 00:00:00 2001 From: Alozie Obuh Date: Sun, 13 Jun 2021 04:21:53 -0600 Subject: [PATCH 1/6] update yq to 4.6.9 --- hardening_manifest.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b24a790..5c6e1c2 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -45,10 +45,10 @@ resources: type: sha256 value: a352e13a8438045b8ed138b821cb757c177acd999c1af77345152d7a64b0ddb7 - filename: yq - url: https://github.com/mikefarah/yq/releases/download/v4.6.2/yq_linux_amd64 + url: https://github.com/mikefarah/yq/releases/download/v4.6.9/yq_linux_amd64 validation: type: sha256 - value: ddc532d3ecace34e30fcfd0a623d539f9cb013ea555e7e63733c208a30a0fd66 + value: a1cfa39a9538e27f11066aa5659b32f9beae1eea93369d395bf45bcfc8a181dc - filename: kpt.tar.gz url: https://github.com/GoogleContainerTools/kpt/releases/download/v0.38.1/kpt_linux_amd64-0.38.1.tar.gz validation: -- GitLab From 489c6a0572f662731864f6a0de9dfb49a316eb43 Mon Sep 17 00:00:00 2001 From: Alozie Obuh Date: Sun, 13 Jun 2021 04:47:32 -0600 Subject: [PATCH 2/6] update dependencies --- hardening_manifest.yaml | 4 ++-- lib/manager/ironbank/__fixtures__/hardening_manifest.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 5c6e1c2..54409ed 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -50,10 +50,10 @@ resources: type: sha256 value: a1cfa39a9538e27f11066aa5659b32f9beae1eea93369d395bf45bcfc8a181dc - filename: kpt.tar.gz - url: https://github.com/GoogleContainerTools/kpt/releases/download/v0.38.1/kpt_linux_amd64-0.38.1.tar.gz + url: https://github.com/GoogleContainerTools/kpt/releases/download/v0.39.3/kpt_linux_amd64-0.39.3.tar.gz validation: type: sha256 - value: e2f6d3b1558f103d2ede455b3c6335631f02e865929a02dc56a89d52684fc652 + value: 21fcf6f806cf848422227a88ec96f6f650f9c74a66c4107848cbce11c5944def # List of project maintainers maintainers: diff --git a/lib/manager/ironbank/__fixtures__/hardening_manifest.yaml b/lib/manager/ironbank/__fixtures__/hardening_manifest.yaml index 41cec99..7f6911e 100644 --- a/lib/manager/ironbank/__fixtures__/hardening_manifest.yaml +++ b/lib/manager/ironbank/__fixtures__/hardening_manifest.yaml @@ -1,16 +1,16 @@ resources: - url: "docker://docker.io/jboss/keycloak@sha256:e2a216ff6dc3f9ba88d77132c930f8e15dd50ebca1ead6e21696f61b22f0ee10" tag: "jboss/keycloak:13.0.1" - - url: "https://github.com/etcd-io/etcd/releases/download/v3.4.8/etcd-v3.4.8-linux-amd64.tar.gz" + - url: "https://github.com/etcd-io/etcd/releases/download/v3.4.16/etcd-v3.4.16-linux-amd64.tar.gz" filename: etcd.tar.gz validation: type: sha256 - value: a3a332a68fe8dedf20149c1a4b8746fe8061b72d75d3a5850b17e04de9ed7942 - - url: "https://github.com/fluent/fluentd/archive/v1.10.3.tar.gz" + value: 2e2d5b3572e077e7641193ed07b4929b0eaf0dc2f9463e9b677765528acafb89 + - url: "https://github.com/fluent/fluentd/archive/v1.13.0.tar.gz" filename: fluentd.tar.gz validation: type: sha256 - value: c2b5bbb6c2236f73310b22c748e32a88f25288f3e6e1bd272f3dccc6a2322160 + value: fd990a6f97318db6b987529aab8b559508c146021208ba600dad0685fd102051 - filename: urllib3-1.25.10-py2.py3-none-any.whl url: https://files.pythonhosted.org/packages/9f/f0/a391d1463ebb1b233795cabfc0ef38d3db4442339de68f847026199e69d7/urllib3-1.25.10-py2.py3-none-any.whl validation: -- GitLab From 1dc97fe255781c15dae8e097c47187ac7fc01949 Mon Sep 17 00:00:00 2001 From: Alozie Obuh Date: Sun, 13 Jun 2021 05:23:01 -0600 Subject: [PATCH 3/6] update dependencies --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 54409ed..3d55cd9 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -45,7 +45,7 @@ resources: type: sha256 value: a352e13a8438045b8ed138b821cb757c177acd999c1af77345152d7a64b0ddb7 - filename: yq - url: https://github.com/mikefarah/yq/releases/download/v4.6.9/yq_linux_amd64 + url: https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 validation: type: sha256 value: a1cfa39a9538e27f11066aa5659b32f9beae1eea93369d395bf45bcfc8a181dc -- GitLab From df72a6b275d3bb691a0f5ea93d131fdb77d81659 Mon Sep 17 00:00:00 2001 From: Alozie Obuh Date: Sun, 13 Jun 2021 21:07:22 -0600 Subject: [PATCH 4/6] Update tag to v25.41.1 --- Dockerfile | 2 +- hardening_manifest.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7f339..05be879 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.17.0 -FROM renovate/renovate:25.41.0 as builder +FROM renovate/renovate:25.41.1 as builder FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e0fc20c..503d722 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.41.0" +- "25.41.1" - "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.41.0" + org.opencontainers.image.version: "25.41.1" ## 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.41.0 - url: docker://docker.io/renovate/renovate@sha256:1d71cb4557165d78fa64fce23ae9422bd9f3438aaf0de492e854bab1b5c284c5 +- tag: renovate/renovate:25.41.1 + url: docker://docker.io/renovate/renovate@sha256:88e6ede9723330079a0eb21974c94316a3b5ca9f75d43bdeceea502b691ce6cf - 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 974b81dc47506b321ed579ce630afd948859bd8c Mon Sep 17 00:00:00 2001 From: renovate Date: Tue, 15 Jun 2021 01:18:31 +0000 Subject: [PATCH 5/6] Update renovate/renovate Docker tag to v25.41.1 --- Dockerfile | 2 +- hardening_manifest.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7f339..05be879 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.17.0 -FROM renovate/renovate:25.41.0 as builder +FROM renovate/renovate:25.41.1 as builder FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b24a790..9058249 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.41.0" +- "25.41.1" - "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.41.0" + org.opencontainers.image.version: "25.41.1" ## 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.41.0 - url: docker://docker.io/renovate/renovate@sha256:c6d78db36621da9ab120fdb19d1d949b4c04132439da6845d2f489bc78c61003 +- tag: renovate/renovate:25.41.1 + url: docker://docker.io/renovate/renovate@sha256:88e6ede9723330079a0eb21974c94316a3b5ca9f75d43bdeceea502b691ce6cf - 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 8dc5083d9504601e487ab9912e40161b5db89c23 Mon Sep 17 00:00:00 2001 From: renovate Date: Tue, 15 Jun 2021 04:14:45 +0000 Subject: [PATCH 6/6] Update renovate/renovate:25.41.0 Docker digest to 1d71cb4 --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3d55cd9..e0fc20c 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.41.0 - url: docker://docker.io/renovate/renovate@sha256:c6d78db36621da9ab120fdb19d1d949b4c04132439da6845d2f489bc78c61003 + url: docker://docker.io/renovate/renovate@sha256:1d71cb4557165d78fa64fce23ae9422bd9f3438aaf0de492e854bab1b5c284c5 - 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