Migrate to hardening_manifest.yaml

Dockerfile

@@ -6,11 +6,6 @@ FROM sonarqube:8.5-enterprise AS build
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="SonarQube" \
-      org.opencontainers.image.description="SonarQube is an automatic code review tool to detect bugs, vulnerabilities and code smells in your code." \
-      org.opencontainers.image.licenses="All rights reserved" \
-      org.opencontainers.image.version="8.5-enterprise" \
-      maintainer="SonarSource"
 
 ARG SONARQUBE_VERSION="8.5-enterprise"
 ENV SONAR_VERSION="${SONARQUBE_VERSION}" \

Jenkinsfile

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

download.yaml

----
-resources:
-  - url: "docker://docker.io/library/sonarqube@sha256:a06e03b30d68ed4ffcc3a9f2b4192e804f5ec83ffe00a93a57a8ef46416411c0"
-    tag: "sonarqube:8.5-enterprise"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "sonarsource/sonarqube/sonarqube8-enterprise"
+
+# 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:
+- "8.5-enterprise"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "redhat/openjdk/openjdk11"
+  BASE_TAG: "1.11"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "sonarqube8-enterprise"
+  ## 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: "8.5-enterprise"
+  ## 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: sonarqube:8.5-enterprise
+  url: docker://docker.io/library/sonarqube@sha256:a06e03b30d68ed4ffcc3a9f2b4192e804f5ec83ffe00a93a57a8ef46416411c0
+
+# 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: "melissari_sean@bah.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"
+  ],
   "postUpgradeTasks": {
-    "commands": ["kpt pkg sync ."],
-    "fileFilters": ["scripts/*"]
+    "commands": [
+      "kpt pkg sync ."
+    ],
+    "fileFilters": [
+      "scripts/*"
+    ]
   },
   "regexManagers": [
     {
-      "fileMatch": ["^Dockerfile$"],
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
       "matchStrings": [
         "version=\"(?<currentValue>.*?)\""
       ],
@@ -16,7 +26,9 @@
       "versioningTemplate": "docker"
     },
     {
-      "fileMatch": ["^Dockerfile$"],
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
       "matchStrings": [
         "SONARQUBE_VERSION=\"(?<currentValue>.*?)\""
       ],
@@ -25,22 +37,37 @@
       "versioningTemplate": "docker"
     },
     {
-      "fileMatch": ["^Jenkinsfile$"],
+      "fileMatch": [
+        "^Kptfile$"
+      ],
+      "matchStrings": [
+        "\\s+ref:\\s+(?<currentValue>.*?)\n"
+      ],
+      "depNameTemplate": "SonarSource/docker-sonarqube",
+      "datasourceTemplate": "github-tags",
+      "versioningTemplate": "loose"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "sonarqube",
       "datasourceTemplate": "docker",
       "versioningTemplate": "docker"
     },
     {
-      "fileMatch": ["^Kptfile$"],
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "\\s+ref:\\s+(?<currentValue>.*?)\n"
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
-      "depNameTemplate": "SonarSource/docker-sonarqube",
-      "datasourceTemplate": "github-tags",
-      "versioningTemplate": "loose"
+      "depNameTemplate": "sonarqube",
+      "datasourceTemplate": "docker",
+      "versioningTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file