Merge branch 'development' into 'master'

Development

See merge request !33

Dockerfile

@@ -6,12 +6,6 @@ FROM prom/prometheus:v2.23.0 as base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="prometheus" \
-      org.opencontainers.image.description="Prometheus is an open-source systems monitoring and alerting toolkit." \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="https://prometheus.io/" \
-      org.opencontainers.image.version="v2.23.0" \
-      maintainer="cht@dsop.io"
 
 COPY --from=base /bin/prometheus /bin/prometheus 
 COPY --from=base /bin/promtool /bin/promtool

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "v2.23.0")

download.yaml

-resources:
-  - url: "docker://docker.io/prom/prometheus@sha256:3d4983246977fd7fe398fd65e90c46a68ae7178cfe70912fb689d9aca5468975"
-    tag: "prom/prometheus:v2.23.0"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "opensource/prometheus/prometheus"
+
+# 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:
+- "v2.23.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: "prometheus"
+  # Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "Prometheus is an open-source systems monitoring and alerting toolkit."
+  # 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://prometheus.io/"
+  # Name of the distributing entity, organization or individual
+  org.opencontainers.image.vendor: "Cloud Native Computing Foundation"
+  org.opencontainers.image.version: "v2.23.0"
+  # Keywords to help with search (ex. "cicd,gitops,golang")
+  mil.dso.ironbank.image.keywords: "prometheus,metrics,analytics,collect"
+  # 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: "prometheus"
+
+# List of resources to make available to the offline build context
+resources:
+- tag: prom/prometheus:v2.23.0
+  url: docker://docker.io/prom/prometheus@sha256:3d4983246977fd7fe398fd65e90c46a68ae7178cfe70912fb689d9aca5468975
+
+# List of project maintainers
+maintainers:
+- email: "gavin.scallon@parsons.com"
+  # The name of the current container owner
+  name: "Gavin Scallon"
+  # The gitlab username of the current container owner
+  username: "gscallon"
+  cht_member: true

renovate.json

 {
-  "assignees": ["@sean.melissari"],
-  "baseBranches": ["development"],
+  "assignees": [
+    "@sean.melissari"
+  ],
+  "baseBranches": [
+    "development"
+  ],
   "regexManagers": [
     {
-      "fileMatch": ["^Dockerfile$"],
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
       "matchStrings": [
         "version=\"(?<currentValue>.*?)\""
       ],
@@ -11,12 +17,24 @@
       "datasourceTemplate": "docker"
     },
     {
-      "fileMatch": ["^Jenkinsfile$"],
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "prom/prometheus",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "prom/prometheus",
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file