From 2e759764d409c0207021be41c1c67f733b568dfb Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:27:10 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 10 -------- Jenkinsfile | 2 -- hardening_manifest.yaml | 53 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 12 deletions(-) delete mode 100644 Jenkinsfile create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index 1d38ae9..eb4abed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,16 +29,6 @@ Python's elegant syntax and dynamic typing, together with its interpreted nature make it an ideal language for scripting and rapid application development in many areas \ on most platforms." -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="Python 3.6" \ - io.openshift.tags="builder,python,python36,python-36,rh-python36" \ - com.redhat.component="ubi8-container" \ - name="ubi8/python-36" \ - version="1" \ - com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \ - maintainer="DSOP Container Hardening Team" # Copy extra files to the image. COPY ./scripts / diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index fcafb97..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "3.6") diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..ec1a8ed --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,53 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "redhat/python/python36" + +# 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: +- "3.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: "python36" + ## 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: "3.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: [] + +# 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: "hojeda@redhat.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 0039ae3ccec95fa29aead9ef95c0644f8b2fffbb Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 21 Dec 2020 21:52:12 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index ec1a8ed..8dcf53b 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -19,35 +19,21 @@ args: # Docker image labels labels: org.opencontainers.image.title: "python36" - ## 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.description: "Python programming language" + org.opencontainers.image.licenses: "Python Software Foundation" + org.opencontainers.image.url: "https://www.python.org/" + org.opencontainers.image.vendor: "Python Software Foundation" org.opencontainers.image.version: "3.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" + mil.dso.ironbank.image.keywords: "python, programming language" + mil.dso.ironbank.image.type: "opensource" + mil.dso.ironbank.product.name: "python" # List of resources to make available to the offline build context resources: [] # 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: "hojeda@redhat.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" +- email: "melissari_sean@bah.com" + name: "Sean Melissari" + username: "smelissari" + cht_member: true -- GitLab