Merge branch 'hardening_manifest' into 'development'

Migrate to hardening_manifest.yaml

See merge request !27

Dockerfile

@@ -6,12 +6,6 @@ FROM vault:1.6.0 AS source
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="vault" \
-      org.opencontainers.image.description="Vault is a tool for securely accessing secrets." \
-      org.opencontainers.image.licenses="MPL-2.0" \
-      org.opencontainers.image.url="https://www.vaultproject.io/" \
-      org.opencontainers.image.version="1.6.0" \
-      maintainer="cht@dsop.io"
 
 COPY --from=source /bin/vault /bin/vault
 COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "1.6.0")
-

download.yaml

-resources:
-  - url: "docker://docker.io/library/vault@sha256:b04266db3e7ece92690df720fcf98ecf138a92ed3d1edc14dc86fe814c33ab9b"
-    tag: "vault:1.6.0"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "hashicorp/vault/vault"
+
+# 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:
+- "1.6.0"
+- "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: "vault"
+  ## Human-readable description of the software packaged in the image
+  # org.opencontainers.image.description: "FIXME"
+  ## License(s) under which contained software is distributed
+  # org.opencontainers.image.licenses: "FIXME"
+  ## URL to find more information on the image
+  # org.opencontainers.image.url: "FIXME"
+  ## Name of the distributing entity, organization or individual
+  # org.opencontainers.image.vendor: "FIXME"
+  org.opencontainers.image.version: "1.6.0"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  # mil.dso.ironbank.image.keywords: "FIXME"
+  ## This value can be "opensource" or "commercial"
+  # mil.dso.ironbank.image.type: "FIXME"
+  ## 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: vault:1.6.0
+  url: docker://docker.io/library/vault@sha256:b04266db3e7ece92690df720fcf98ecf138a92ed3d1edc14dc86fe814c33ab9b
+
+# List of project maintainers
+# FIXME: Fill in the following details for the current container owner in the whitelist
+# FIXME: Include any other vendor information if applicable
+maintainers:
+- email: "brianmiller@cloudfitsoftware.com"
+#   # The name of the current container owner
+#   name: "FIXME"
+#   # The gitlab username of the current container owner
+#   username: "FIXME"
+#   cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
+# - name: "FIXME"
+#   username: "FIXME"
+#   email: "FIXME"

renovate.json

 {
-  "assignees": ["@sean.melissari"],
-  "baseBranches": ["development"],
+  "assignees": [
+    "@sean.melissari"
+  ],
+  "baseBranches": [
+    "development"
+  ],
   "regexManagers": [
     {
-      "fileMatch": ["^Dockerfile$"],
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
       "matchStrings": [
         "version=\"(?<currentValue>.*?)\""
       ],
@@ -11,9 +17,21 @@
       "datasourceTemplate": "docker"
     },
     {
-      "fileMatch": ["^Jenkinsfile$"],
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "vault",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "vault",
       "datasourceTemplate": "docker"