Merge branch 'development' into 'master'

development

See merge request !38

Dockerfile

@@ -2,16 +2,10 @@ ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.2
 
-FROM minio/mc:RELEASE.2020-11-25T23-04-07Z as base
+FROM minio/mc:RELEASE.2021-02-07T02-02-05Z as base
 
 FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
 
-LABEL org.opencontainers.image.title="mc" \
-      org.opencontainers.image.description="MinIO Client (mc) provides a modern alternative to UNIX commands." \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="https://github.com/minio/mc" \
-      org.opencontainers.image.version="RELEASE.2020-11-25T23-04-07Z" \
-      maintainer="cht@dsop.io"
 
 RUN dnf update -y && \
     dnf clean all && \

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "RELEASE.2020-11-25T23-04-07Z")
\ No newline at end of file

download.yaml

-resources:
-  - url: "docker://docker.io/minio/mc@sha256:bc19490aabfc3f2f7e8eac1ea16fc5292e4a224c4436d9347543239205228202"
-    tag: "minio/mc:RELEASE.2020-11-25T23-04-07Z"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "opensource/minio/mc"
+
+# List of tags to push for the repository in registry1
+# The most specific version should be the first tag and will be shown
+# on ironbank.dsop.io
+tags:
+- "RELEASE.2021-02-07T02-02-05Z"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "redhat/ubi/ubi8"
+  BASE_TAG: "8.3"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "mc"
+  # Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "MinIO Client (mc) provides a modern alternative to UNIX commands like ls, cat, cp, mirror, diff, find etc."
+  # License(s) under which contained software is distributed
+  org.opencontainers.image.licenses: "Apache-2.0"
+  # URL to find more information on the image
+  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-02-07T02-02-05Z"
+  # Keywords to help with search (ex. "cicd,gitops,golang")
+  mil.dso.ironbank.image.keywords: "utilities"
+  # This value can be "opensource" or "commercial"
+  mil.dso.ironbank.image.type: "opensource"
+  # Product the image belongs to for grouping multiple images
+  mil.dso.ironbank.product.name: "FIXME"
+
+# List of resources to make available to the offline build context
+resources:
+- tag: minio/mc:RELEASE.2021-02-07T02-02-05Z
+  url: docker://docker.io/minio/mc@sha256:ede439913d4feceb7d1155c0db31ef79967b95fd07bf3a4e127ef3929f51604b
+
+# List of project maintainers
+maintainers:
+- email: "michael.simmons@anchore.com"
+  # The name of the current container owner
+  name: "Michael Simmons"
+  # The gitlab username of the current container owner
+  username: "msimmons719"
+  cht_member: true

renovate.json

 {
-    "assignees": ["@msimmons719"],
-    "baseBranches": ["development"],
-    "packageRules": [
-      {
-        "datasources": ["docker"],
-        "packageNames": ["minio/mc"],
-        "versioning": "regex:^RELEASE\\.(?<major>\\d+)-(?<minor>\\d+)-(?<patch>\\d+)T.*Z(-(?<compatibility>.*))?$",
-        "major": {
-          "enabled": true
-        }
+  "assignees": [
+    "@msimmons719"
+  ],
+  "baseBranches": [
+    "development"
+  ],
+  "packageRules": [
+    {
+      "datasources": [
+        "docker"
+      ],
+      "packageNames": [
+        "minio/mc"
+      ],
+      "versioning": "regex:^RELEASE\\.(?<major>\\d+)-(?<minor>\\d+)-(?<patch>\\d+)T.*Z(-(?<compatibility>.*))?$",
+      "major": {
+        "enabled": true
       }
-    ],
-    "regexManagers": [
-      {
-        "fileMatch": ["^Dockerfile$"],
-        "matchStrings": [
-          "version=\"(?<currentValue>.*?)\""
-        ],
-        "depNameTemplate": "minio/mc",
-        "datasourceTemplate": "docker"
-      },
-      {
-        "fileMatch": ["^Jenkinsfile$"],
-        "matchStrings": [
-          "version:\\s+\"(?<currentValue>.*?)\""
-        ],
-        "depNameTemplate": "minio/mc",
-        "datasourceTemplate": "docker"
-      }
-    ]
-}  
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "minio/mc",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "minio/mc",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "minio/mc",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}
\ No newline at end of file