From 38386a71ac521ef90c5c7aaf8be6a8ebd5bae59e Mon Sep 17 00:00:00 2001
From: ironbank-bot <ironbank-bot@dsop.io>
Date: Thu, 10 Dec 2020 01:12:15 +0000
Subject: [PATCH] Migrate to hardening_manifest.yaml

---
 Dockerfile              |  6 -----
 Jenkinsfile             |  2 --
 download.yaml           |  8 ------
 hardening_manifest.yaml | 60 +++++++++++++++++++++++++++++++++++++++++
 renovate.json           | 30 ++++++++++++++++-----
 5 files changed, 84 insertions(+), 22 deletions(-)
 delete mode 100644 Jenkinsfile
 delete mode 100644 download.yaml
 create mode 100644 hardening_manifest.yaml

diff --git a/Dockerfile b/Dockerfile
index a57f51b..eb7644f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,6 @@ RUN dnf install -y gcc make && \
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL org.opencontainers.image.title="clair" \
-      org.opencontainers.image.description="Clair is an open source project for the static analysis of vulnerabilities in application containers." \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.url="https://github.com/quay/clair" \
-      org.opencontainers.image.version="v2.1.6" \
-      maintainer="cht@dsop.io"
 
 RUN groupadd -g 1000 clair && \
     useradd -r -u 1000 -m -s /sbin/nologin -g clair clair && \
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index ab26f17..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,2 +0,0 @@
-@Library('DCCSCR@master') _
-dccscrPipeline(version: "v2.1.6")
diff --git a/download.yaml b/download.yaml
deleted file mode 100644
index 68ff41c..0000000
--- a/download.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-resources:
-  - url: "docker://quay.io/coreos/clair@sha256:ac7ea2811ac7f21a140b048c9b02bd9854b881b62dca0a4f7bfc7220db399710"
-    tag: "quay.io/coreos/clair:v2.1.6"
-  - url: "https://musl.libc.org/releases/musl-1.2.0.tar.gz"
-    filename: musl.tar.gz
-    validation:
-      type: sha256
-      value: c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
new file mode 100644
index 0000000..08eb49f
--- /dev/null
+++ b/hardening_manifest.yaml
@@ -0,0 +1,60 @@
+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "opensource/quay/clair"
+
+# 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.6"
+- "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: "clair"
+  ## 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: "v2.1.6"
+  ## 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: quay.io/coreos/clair:v2.1.6
+  url: docker://quay.io/coreos/clair@sha256:ac7ea2811ac7f21a140b048c9b02bd9854b881b62dca0a4f7bfc7220db399710
+- filename: musl.tar.gz
+  url: https://musl.libc.org/releases/musl-1.2.0.tar.gz
+  validation:
+    type: sha256
+    value: c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8
+
+# 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"
diff --git a/renovate.json b/renovate.json
index dbda446..48644b5 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,9 +1,15 @@
 {
-  "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": "quay.io/coreos/clair",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
       "matchStrings": [
-        "version:\\s+\"(?<currentValue>.*?)\""
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "quay.io/coreos/clair",
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file
-- 
GitLab