From d97054a18c53c565d00c293274febd7d64d07670 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Fri, 11 Dec 2020 14:40:06 +0000 Subject: [PATCH] Migrate to hardening_manifest.yaml --- Dockerfile | 7 ------ Jenkinsfile | 2 -- download.yaml | 3 --- hardening_manifest.yaml | 48 +++++++++++++++++++++++++++++++++++++++++ renovate.json | 30 ++++++++++++++++++++------ 5 files changed, 72 insertions(+), 18 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 0867be7..6742779 100644 --- a/Dockerfile +++ b/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 && \ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3acb148..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "v2.1.1") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index afa38a6..0000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/goharbor/notary-signer-photon@sha256:23e5dfa4e36c8eee5263362c93e985e342df00737f34cd24a48f406e9c527815" - tag: "goharbor/notary-signer-photon:v2.1.1" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..0ba84e9 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,48 @@ +--- +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 diff --git a/renovate.json b/renovate.json index 215a523..ec4f46a 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,12 +17,24 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "goharbor/notary-signer-photon", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "goharbor/notary-signer-photon", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file -- GitLab