From b61054a9cb7b91f26787ddaf98298c31068d90f6 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:02:43 +0000 Subject: [PATCH 1/5] Migrate to hardening_manifest.yaml --- Dockerfile | 7 ----- Jenkinsfile | 10 ------- download.yaml | 7 ----- hardening_manifest.yaml | 58 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 24 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 97f7223..ae7114b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,6 @@ ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL name="Coverity SAST Server" \ - maintainer="kumykov@synopsys.com" \ - vendor="Synopsys" \ - version="2020.03" \ - release="1" \ - summary="Coverity SAST Server Image" \ - description="Coverity SAST Server Image" # Give children and other processes 5 minutes to timeout ENV VENDOR=Synopsys \ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 829c02a..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,10 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.4.2") - -/* Optional parameters: -dccscrPipeline(contributor: "synopsys", - product: "coverity", - image: "coverity", - version: "2019.09") -*/ - diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 0e4089f..0000000 --- a/download.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -resources: - - url: https://dccscr-projects.s3.amazonaws.com/coverity/2020.03/coverity-platform-linux64-2020.03.tar.gz - filename: coverity-platform-linux64-2020.03.tar.gz - validation: - type: sha256 - value: 7787d2c8114cdedb2307839f29fac00afaa6c94f0b4d5c6508eec688e222e714 diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..daa918a --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,58 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "synopsys/coverity/coverity" + +# 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.4.2" +- "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: "coverity" + ## 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.4.2" + ## 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: +- filename: coverity-platform-linux64-2020.03.tar.gz + url: https://dccscr-projects.s3.amazonaws.com/coverity/2020.03/coverity-platform-linux64-2020.03.tar.gz + validation: + type: sha256 + value: 7787d2c8114cdedb2307839f29fac00afaa6c94f0b4d5c6508eec688e222e714 + +# 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: "kumykov@synopsys.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" -- GitLab From 2cdcf40f825c5f790538f8bb561517bfa9888ab5 Mon Sep 17 00:00:00 2001 From: Murat Kumykov Date: Wed, 24 Feb 2021 13:36:42 +0000 Subject: [PATCH 2/5] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae7114b..5cacac6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_REGISTRY=registry.access.redhat.com ARG BASE_IMAGE=ubi8/ubi -ARG BASE_TAG=8.2 +ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -- GitLab From a22e80fa170e7130c309039ec373d7ee5e9aa810 Mon Sep 17 00:00:00 2001 From: Murat Kumykov Date: Wed, 24 Feb 2021 13:39:24 +0000 Subject: [PATCH 3/5] Update hardening_manifest.yaml --- hardening_manifest.yaml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index daa918a..a71f196 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "coverity" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "Backend/UI container for Coverity Platform" ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "Synopsys proprietary License" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "coverity" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "Synopsys, Inc." org.opencontainers.image.version: "1.4.2" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "SAST" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "commercial" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.product.name: "Coverity" # List of resources to make available to the offline build context resources: @@ -48,11 +48,6 @@ resources: # FIXME: Include any other vendor information if applicable maintainers: - email: "kumykov@synopsys.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" + name: "Murat Kumykov" + username: "kumykov" + cht_member: false -- GitLab From 408f22bdbcc5d8bee0f55e3c16a12296677eb3c1 Mon Sep 17 00:00:00 2001 From: Murat Kumykov Date: Wed, 24 Feb 2021 20:13:22 +0000 Subject: [PATCH 4/5] base image and Jenkinsfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5cacac6..de5329c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG BASE_REGISTRY=registry.access.redhat.com -ARG BASE_IMAGE=ubi8/ubi +ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -- GitLab From faf84939aeff6829b72bff746c64989ec5455580 Mon Sep 17 00:00:00 2001 From: Murat Kumykov Date: Wed, 24 Feb 2021 20:19:46 +0000 Subject: [PATCH 5/5] Dockerfile update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de5329c..6dad5a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 -- GitLab