Merge branch 'development' into 'master'

add hardening manifest

See merge request !15

Dockerfile

@@ -6,13 +6,6 @@ FROM goharbor/notary-signer-photon:v2.1.1 as base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="notary-signer" \
-      org.opencontainers.image.description="Harbor is an open source cloud native registry that stores, signs, and scans content." \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="https://goharbor.io" \
-      org.opencontainers.image.version="v2.1.1" \
-      maintainer="cht@dsop.io"
-
 ENV SERVICE_NAME=notary_signer
 
 RUN groupadd -g 1000 notary && \

Jenkinsfile

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

download.yaml

-resources:
-  - url: "docker://docker.io/goharbor/notary-signer-photon@sha256:23e5dfa4e36c8eee5263362c93e985e342df00737f34cd24a48f406e9c527815"
-    tag: "goharbor/notary-signer-photon:v2.1.1"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "opensource/goharbor/notary-signer"
+
+# 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.1.1"
+- "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: "notary-signer"
+  ## Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "Notary aims to make the internet more secure by making it easy for people to publish and verify content."
+  ## 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://github.com/theupdateframework/notary"
+  ## Name of the distributing entity, organization or individual
+  org.opencontainers.image.vendor: "goharbor"
+  org.opencontainers.image.version: "v2.1.1"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  mil.dso.ironbank.image.keywords: "container,registry,signing"
+  ## 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: "Harbor"
+
+# List of resources to make available to the offline build context
+resources:
+- tag: goharbor/notary-signer-photon:v2.1.1
+  url: docker://docker.io/goharbor/notary-signer-photon@sha256:23e5dfa4e36c8eee5263362c93e985e342df00737f34cd24a48f406e9c527815
+
+# List of project maintainers
+maintainers:
+- name: "Sean Melissari"
+  username: "sean.melissari"
+  email: "melissari_sean@bah.com"
+  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": "goharbor/notary-signer-photon",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "goharbor/notary-signer-photon",
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file