From 682defa575f8fb0eaa8b22f0ebaf76d4257831fc Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:25:40 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 7 ------ download.yaml | 6 ----- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 13 deletions(-) delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index d60e98a..127afd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,6 @@ FROM amazon/aws-controllers-k8s:ecr-v0.0.1 AS builder FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG -LABEL name="aws-controllers-k8s" \ - maintainer="cht@dsop.io" \ - vendor="Opensource" \ - version="ecr-v0.0.1" \ - release="1" \ - summary="Image of aws controller for Kubernetes" \ - description="Configure to use AWS controllers for integrated services: ecr-v0.01" COPY --from=builder /bin/controller /bin/ RUN groupadd -r awscontrollersk8suser && \ diff --git a/download.yaml b/download.yaml deleted file mode 100644 index ce2ace6..0000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -version: ecr-v0.0.1 -resources: - - url: docker://amazon/aws-controllers-k8s@sha256:015483c0f6992a262b47847dc47f928badad8312c02f6ac081830c16951b50e6 - tag: amazon/aws-controllers-k8s:ecr-v0.0.1 - \ No newline at end of file diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..8e60f6a --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "aws/aws-controllers-k8s/ecr" + +# 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: +- "ecr-v0.0.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: "ecr" + ## 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: "ecr-v0.0.1" + ## 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: amazon/aws-controllers-k8s:ecr-v0.0.1 + url: docker://amazon/aws-controllers-k8s@sha256:015483c0f6992a262b47847dc47f928badad8312c02f6ac081830c16951b50e6 + +# 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: "vivek.pranavamurthi.1@us.af.mil" +# # 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 22c0868cce4a2682f60ccc0d1a7aafa80dd451a9 Mon Sep 17 00:00:00 2001 From: Vivek Pranavamurthii Date: Thu, 10 Dec 2020 19:19:23 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 8e60f6a..c78f592 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -19,21 +19,12 @@ args: # Docker image labels labels: org.opencontainers.image.title: "ecr" - ## 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: "Image of aws controller for Kubernetes" + org.opencontainers.image.licenses: "Apache License 2.0" + org.opencontainers.image.url: "https://github.com/aws/aws-controllers-k8s" + org.opencontainers.image.vendor: "Opensource" org.opencontainers.image.version: "ecr-v0.0.1" - ## 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: @@ -45,11 +36,6 @@ resources: # FIXME: Include any other vendor information if applicable maintainers: - email: "vivek.pranavamurthi.1@us.af.mil" -# # 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: "Vivek Pranavamurthi" + username: "vivekp" + cht_member: true -- GitLab