From 8ad4ae7fb1a8593f1111ce79ee30a8cd2876c2b1 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:21:24 +0000 Subject: [PATCH] Migrate to hardening_manifest.yaml --- Dockerfile | 6 ---- Jenkinsfile | 2 -- download.yaml | 13 --------- hardening_manifest.yaml | 65 +++++++++++++++++++++++++++++++++++++++++ renovate.json | 34 ++++++++++++++++----- 5 files changed, 92 insertions(+), 28 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index e083ff2..cac17a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,6 @@ FROM apache/nifi:1.12.1 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="NiFi" \ - org.opencontainers.image.description="Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://nifi.apache.org/" \ - org.opencontainers.image.version="1.12.1" \ - maintainer="cht@dsop.io" ENV NIFI_VERSION=1.12.1 ENV NIFI_BASE_DIR=/opt/nifi diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 7b192a9..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.12.1") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 4670911..0000000 --- a/download.yaml +++ /dev/null @@ -1,13 +0,0 @@ -resources: - - url: "docker://docker.io/apache/nifi@sha256:bf7576ab7ad0bfe38c86be5baa47229d1644287984034dc9d5ff4801c5827115" - tag: "apache/nifi:1.12.1" - - url: "https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/x/xmlstarlet-1.6.1-11.el8.x86_64.rpm" - filename: xmlstarlet.rpm - validation: - type: sha256 - value: 1db13a198139dbbb4aedc079a2c5f74a01d036f4c816c9aab7f8ef7c10b019f0 - - url: "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" - filename: jq-linux64 - validation: - type: sha256 - value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..54e52ea --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,65 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/apache/nifi" + +# 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.12.1" +- "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: "nifi" + ## 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.12.1" + ## 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: apache/nifi:1.12.1 + url: docker://docker.io/apache/nifi@sha256:bf7576ab7ad0bfe38c86be5baa47229d1644287984034dc9d5ff4801c5827115 +- filename: xmlstarlet.rpm + url: https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/x/xmlstarlet-1.6.1-11.el8.x86_64.rpm + validation: + type: sha256 + value: 1db13a198139dbbb4aedc079a2c5f74a01d036f4c816c9aab7f8ef7c10b019f0 +- filename: jq-linux64 + url: https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 + validation: + type: sha256 + value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 + +# 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 9ef2356..fa973d1 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=\"(?.*?)\"" ], @@ -11,7 +17,9 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Dockerfile$"], + "fileMatch": [ + "^Dockerfile$" + ], "matchStrings": [ "VERSION=\"(?.*?)\"" ], @@ -19,12 +27,24 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "apache/nifi", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "apache/nifi", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file -- GitLab