From 5ae3ea34265a444a62b03c5682cdee22043e7551 Mon Sep 17 00:00:00 2001 From: renovate Date: Fri, 11 Jun 2021 18:54:55 +0000 Subject: [PATCH 1/4] Update minio/mc:RELEASE.2021-06-08T01-29-37Z Docker digest to 4df1b8b --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3ff089c..3d6165f 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: minio/mc:RELEASE.2021-06-08T01-29-37Z - url: docker://docker.io/minio/mc@sha256:3f369fdf8f52c9ab21b3c013b3334b921ae9ef3b3176357d81e0f96a6595d2ea + url: docker://docker.io/minio/mc@sha256:4df1b8bec5bff0645de9f4c94344f9977afa3fa3713ac8b66cd7a7282a4e8971 # List of project maintainers maintainers: -- GitLab From 055c413e4a824753b13acabf9c03b5e0a8532ca7 Mon Sep 17 00:00:00 2001 From: renovate Date: Mon, 14 Jun 2021 01:18:13 +0000 Subject: [PATCH 2/4] Update minio/mc Docker tag to vRELEASE.2021-06-13T17-48-22Z --- Dockerfile | 2 +- hardening_manifest.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94f25e3..87479e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=latest -FROM minio/mc:RELEASE.2021-06-08T01-29-37Z as base +FROM minio/mc:RELEASE.2021-06-13T17-48-22Z as base FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 3d6165f..ceeb9f5 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/minio/mc" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "RELEASE.2021-06-08T01-29-37Z" +- "RELEASE.2021-06-13T17-48-22Z" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://docs.min.io/docs/minio-client-complete-guide.html" # Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "MinIO" - org.opencontainers.image.version: "RELEASE.2021-06-08T01-29-37Z" + org.opencontainers.image.version: "RELEASE.2021-06-13T17-48-22Z" # Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "utilities" # 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: minio/mc:RELEASE.2021-06-08T01-29-37Z - url: docker://docker.io/minio/mc@sha256:4df1b8bec5bff0645de9f4c94344f9977afa3fa3713ac8b66cd7a7282a4e8971 +- tag: minio/mc:RELEASE.2021-06-13T17-48-22Z + url: docker://docker.io/minio/mc@sha256:bfd7b4c7751014233570e3fae765ccb7c65ac9e6346bd6effe6cfb1aa9ee6fc0 # List of project maintainers maintainers: -- GitLab From 3b96288b2a49ed853b67b47a24a3de4e376d1c98 Mon Sep 17 00:00:00 2001 From: renovate Date: Thu, 26 Aug 2021 00:17:38 +0000 Subject: [PATCH 3/4] Update minio/mc Docker tag to vRELEASE.2021-07-27T06-46-19Z --- Dockerfile | 2 +- hardening_manifest.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87479e8..8a9bd99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=latest -FROM minio/mc:RELEASE.2021-06-13T17-48-22Z as base +FROM minio/mc:RELEASE.2021-07-27T06-46-19Z as base FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index ceeb9f5..c199951 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/minio/mc" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "RELEASE.2021-06-13T17-48-22Z" +- "RELEASE.2021-07-27T06-46-19Z" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://docs.min.io/docs/minio-client-complete-guide.html" # Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "MinIO" - org.opencontainers.image.version: "RELEASE.2021-06-13T17-48-22Z" + org.opencontainers.image.version: "RELEASE.2021-07-27T06-46-19Z" # Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "utilities" # 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: minio/mc:RELEASE.2021-06-13T17-48-22Z - url: docker://docker.io/minio/mc@sha256:bfd7b4c7751014233570e3fae765ccb7c65ac9e6346bd6effe6cfb1aa9ee6fc0 +- tag: minio/mc:RELEASE.2021-07-27T06-46-19Z + url: docker://docker.io/minio/mc@sha256:4ee74e7e471a39bc695907b7a4f06ae273fd660a1d919253308d1f0566de7a14 # List of project maintainers maintainers: -- GitLab From f4ee8a3da4e294ccd37d5375e00e0ce2b203c69a Mon Sep 17 00:00:00 2001 From: echi Date: Thu, 26 Aug 2021 21:51:08 -0400 Subject: [PATCH 4/4] fixed conflicts --- Dockerfile | 4 ---- hardening_manifest.yaml | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 610609e..8a9bd99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=latest -<<<<<<< HEAD -FROM minio/mc:RELEASE.2021-06-13T17-48-22Z as base -======= FROM minio/mc:RELEASE.2021-07-27T06-46-19Z as base ->>>>>>> origin/development FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index ba86543..c199951 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,11 +8,7 @@ name: "opensource/minio/mc" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -<<<<<<< HEAD -- "RELEASE.2021-06-13T17-48-22Z" -======= - "RELEASE.2021-07-27T06-46-19Z" ->>>>>>> origin/development - "latest" # Build args passed to Dockerfile ARGs @@ -31,11 +27,7 @@ labels: org.opencontainers.image.url: "https://docs.min.io/docs/minio-client-complete-guide.html" # Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "MinIO" -<<<<<<< HEAD - org.opencontainers.image.version: "RELEASE.2021-06-13T17-48-22Z" -======= org.opencontainers.image.version: "RELEASE.2021-07-27T06-46-19Z" ->>>>>>> origin/development # Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "utilities" # This value can be "opensource" or "commercial" @@ -45,13 +37,8 @@ labels: # List of resources to make available to the offline build context resources: -<<<<<<< HEAD -- tag: minio/mc:RELEASE.2021-06-13T17-48-22Z - url: docker://docker.io/minio/mc@sha256:bfd7b4c7751014233570e3fae765ccb7c65ac9e6346bd6effe6cfb1aa9ee6fc0 -======= - tag: minio/mc:RELEASE.2021-07-27T06-46-19Z url: docker://docker.io/minio/mc@sha256:4ee74e7e471a39bc695907b7a4f06ae273fd660a1d919253308d1f0566de7a14 ->>>>>>> origin/development # List of project maintainers maintainers: -- GitLab