From d605ba0e2eee0591b62fe4c48e60af6e14e53e93 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:21:44 +0000 Subject: [PATCH 1/5] Migrate to hardening_manifest.yaml --- Jenkinsfile | 3 -- download.yaml | 16 ---------- hardening_manifest.yaml | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 19 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 9834088..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,3 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "2.4.46") - diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 92d177f..0000000 --- a/download.yaml +++ /dev/null @@ -1,16 +0,0 @@ -resources: - - url: "https://archive.apache.org/dist/httpd/httpd-2.4.46.tar.gz" - filename: "httpd-2.4.46.tar.gz" - validation: - type: "sha256" - value: "44b759ce932dc090c0e75c0210b4485ebf6983466fb8ca1b446c8168e1a1aec2" - - url: "https://downloads.apache.org/apr/apr-1.7.0.tar.gz" - filename: "apr-1.7.0.tar.gz" - validation: - type: "sha256" - value: "48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2" - - url: "https://downloads.apache.org/apr/apr-util-1.6.1.tar.gz" - filename: "apr-util-1.6.1.tar.gz" - validation: - type: "sha256" - value: "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..010a311 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,68 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/apache/apache2" + +# 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: +- "2.4.46" +- "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: "apache2" + ## 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: "2.4.46" + ## 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: httpd-2.4.46.tar.gz + url: https://archive.apache.org/dist/httpd/httpd-2.4.46.tar.gz + validation: + type: sha256 + value: 44b759ce932dc090c0e75c0210b4485ebf6983466fb8ca1b446c8168e1a1aec2 +- filename: apr-1.7.0.tar.gz + url: https://downloads.apache.org/apr/apr-1.7.0.tar.gz + validation: + type: sha256 + value: 48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2 +- filename: apr-util-1.6.1.tar.gz + url: https://downloads.apache.org/apr/apr-util-1.6.1.tar.gz + validation: + type: sha256 + value: b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459 + +# 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: "gfulton@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 e96935ba9cbac1a5b9d365b3efcf5036b7c6cdf6 Mon Sep 17 00:00:00 2001 From: pathak_pradip Date: Thu, 10 Dec 2020 12:51:28 -0800 Subject: [PATCH 2/5] Updated manifest file --- hardening_manifest.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 010a311..92ef785 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "apache2" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "This image was custom built by the DSOP Container Hardening team. It is built on a hardened UBI8 minimal image with Apache2 HTTPD Server installed." ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "All rights reserved" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://downloads.apache.org/httpd/" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" - org.opencontainers.image.version: "2.4.46" + org.opencontainers.image.vendor: "The Apache Software Foundation" + org.opencontainers.image.version: "2.4.46" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "Apache,httpd" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "opensource" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + # mil.dso.ironbank.product.name: "apache" # List of resources to make available to the offline build context resources: @@ -59,7 +59,7 @@ resources: maintainers: - email: "gfulton@redhat.com" # # The name of the current container owner -# name: "FIXME" + # 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 -- GitLab From c31a7af1839001b9518952d9d1694b8489b94f4a Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Fri, 11 Dec 2020 16:36:49 +0000 Subject: [PATCH 3/5] Update hardening_manifest.yaml --- hardening_manifest.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 92ef785..8f58d9d 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,18 +20,18 @@ args: labels: org.opencontainers.image.title: "apache2" ## Human-readable description of the software packaged in the image - org.opencontainers.image.description: "This image was custom built by the DSOP Container Hardening team. It is built on a hardened UBI8 minimal image with Apache2 HTTPD Server installed." + org.opencontainers.image.description: "This image was custom built by the DSOP Container Hardening team. It is built on a hardened UBI8 minimal image with Apache2 HTTPD Server installed." ## License(s) under which contained software is distributed - org.opencontainers.image.licenses: "All rights reserved" + org.opencontainers.image.licenses: "All rights reserved" ## URL to find more information on the image - org.opencontainers.image.url: "https://downloads.apache.org/httpd/" + org.opencontainers.image.url: "https://downloads.apache.org/httpd/" ## Name of the distributing entity, organization or individual - org.opencontainers.image.vendor: "The Apache Software Foundation" - org.opencontainers.image.version: "2.4.46" + org.opencontainers.image.vendor: "The Apache Software Foundation" + org.opencontainers.image.version: "2.4.46" ## Keywords to help with search (ex. "cicd,gitops,golang") - mil.dso.ironbank.image.keywords: "Apache,httpd" + mil.dso.ironbank.image.keywords: "Apache,httpd" ## This value can be "opensource" or "commercial" - mil.dso.ironbank.image.type: "opensource" + mil.dso.ironbank.image.type: "opensource" ## Product the image belongs to for grouping multiple images # mil.dso.ironbank.product.name: "apache" -- GitLab From 378a3f592ac32fddd2e64083eb3a57e24a153abe Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Fri, 11 Dec 2020 16:46:07 +0000 Subject: [PATCH 4/5] Update hardening_manifest.yaml --- hardening_manifest.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 8f58d9d..a11bfd0 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -57,12 +57,12 @@ resources: # FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Include any other vendor information if applicable maintainers: -- email: "gfulton@redhat.com" +- email: "melissari_sean@bah.com" # # The name of the current container owner - # name: "FIXME" + name: "Sean Melissari" # # The gitlab username of the current container owner -# username: "FIXME" -# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT + username: "sean.melissari" + cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT # - name: "FIXME" # username: "FIXME" # email: "FIXME" -- GitLab From 91992339de712a573a74f1736bbda8f9a9d2d642 Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Wed, 16 Dec 2020 15:20:31 +0000 Subject: [PATCH 5/5] Update hardening_manifest.yaml --- hardening_manifest.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a11bfd0..f367444 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,9 +20,9 @@ args: labels: org.opencontainers.image.title: "apache2" ## Human-readable description of the software packaged in the image - org.opencontainers.image.description: "This image was custom built by the DSOP Container Hardening team. It is built on a hardened UBI8 minimal image with Apache2 HTTPD Server installed." + org.opencontainers.image.description: "httpd is an open-source HTTP server for modern operating systems including UNIX and Windows." ## License(s) under which contained software is distributed - org.opencontainers.image.licenses: "All rights reserved" + org.opencontainers.image.licenses: "Apache License 2.0" ## URL to find more information on the image org.opencontainers.image.url: "https://downloads.apache.org/httpd/" ## Name of the distributing entity, organization or individual @@ -33,7 +33,7 @@ labels: ## 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: "apache" + mil.dso.ironbank.product.name: "apache" # List of resources to make available to the offline build context resources: @@ -54,15 +54,10 @@ resources: value: b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459 # 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: "Sean Melissari" # # The gitlab username of the current container owner username: "sean.melissari" - cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT -# - name: "FIXME" -# username: "FIXME" -# email: "FIXME" + cht_member: true -- GitLab