From 3bcad6d9ccb472e60786f0df588877d1db62ce14 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:15:58 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 6 ----- Jenkinsfile | 2 -- download.yaml | 3 --- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ renovate.json | 30 +++++++++++++++++----- 5 files changed, 79 insertions(+), 17 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 9707189..3e50957 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,12 +8,6 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} USER 0 -LABEL org.opencontainers.image.title="lovasoa/wbo" \ - org.opencontainers.image.description="WBO is an online collaborative whiteboard." \ - org.opencontainers.image.licenses="AGPL-3.19" \ - org.opencontainers.image.url="https://github.com/lovasoa/whitebophir" \ - org.opencontainers.image.version="1.6.5" \ - maintainer="cht@dsop.io" RUN rm -rf /opt/app && \ mkdir /opt/app diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 5eeda55..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@timeouts-to-env') _ -dccscrPipeline(version: "1.6.5") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 51802f4..0000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/lovasoa/wbo@sha256:3e213d476431fb1a238247afd7ab1ac61c6f9deeb9eae8d916eccd5d8e123ac2" - tag: "lovasoa/wbo:1.6.5" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..d49ce2e --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/lovasoa/wbo" + +# 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.6.5" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "opensource/nodejs/nodejs12" + BASE_TAG: "12.20.0" + +# Docker image labels +labels: + org.opencontainers.image.title: "wbo" + ## 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.6.5" + ## 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: lovasoa/wbo:1.6.5 + url: docker://docker.io/lovasoa/wbo@sha256:3e213d476431fb1a238247afd7ab1ac61c6f9deeb9eae8d916eccd5d8e123ac2 + +# 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: "shen_vickie@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 319b26f..4982cf0 100644 --- a/renovate.json +++ b/renovate.json @@ -1,9 +1,15 @@ { - "assignees": ["@vickie.shen"], - "baseBranches": ["development"], + "assignees": [ + "@vickie.shen" + ], + "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": "lovasoa/wbo", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "lovasoa/wbo", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file -- GitLab From 569177dd8ae59d2f0711ee12f97676e7567def4c Mon Sep 17 00:00:00 2001 From: jweatherford Date: Fri, 8 Jan 2021 09:52:01 -0500 Subject: [PATCH 2/2] hardening manifest migration --- hardening_manifest.yaml | 43 ++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d49ce2e..1c75305 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -19,21 +19,21 @@ args: # Docker image labels labels: org.opencontainers.image.title: "wbo" - ## 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" + # Human-readable description of the software packaged in the image + org.opencontainers.image.description: "WBO is an online collaborative whiteboard that allows many users to draw simultaneously on a large virtual board." + # License(s) under which contained software is distributed + org.opencontainers.image.licenses: "GPL-3.0-or-later" + # URL to find more information on the image + org.opencontainers.image.url: "https://github.com/lovasoa/whitebophir" + # Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "lovasoa" org.opencontainers.image.version: "1.6.5" - ## 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" + # Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "white board,collaberation" + # 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: "opensource" # List of resources to make available to the offline build context resources: @@ -41,15 +41,10 @@ resources: url: docker://docker.io/lovasoa/wbo@sha256:3e213d476431fb1a238247afd7ab1ac61c6f9deeb9eae8d916eccd5d8e123ac2 # 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: "shen_vickie@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" + # The name of the current container owner + name: "shen_vickie" + # The gitlab username of the current container owner + username: "vickie.shen" + cht_member: true -- GitLab