From 227fa0571153352834344bd0ea8554b7c6e469c3 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:13:30 +0000 Subject: [PATCH 1/3] 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 274dcaf..b6efa6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,6 @@ FROM amazon/aws-cli:2.1.7 as cli FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="aws-cli" \ - org.opencontainers.image.description="Universal Command Line Interface for Amazon Web Services." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://github.com/aws/aws-cli" \ - org.opencontainers.image.version="2.1.7" \ - maintainer="ironbank@dsop.io" COPY --from=cli /usr/local/aws-cli /usr/local/aws-cli diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 46e7bed..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "2.1.7") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 69a89a5..0000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/amazon/aws-cli@sha256:f9b98458849ebd933db6dc2c61d33cb28bb62708cb6a471cbd34f8a7bc575cad" - tag: "amazon/aws-cli:2.1.7" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..d85c86b --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/amazon/aws-cli" + +# 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.1.7" +- "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: "aws-cli" + ## 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.1.7" + ## 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-cli:2.1.7 + url: docker://docker.io/amazon/aws-cli@sha256:f9b98458849ebd933db6dc2c61d33cb28bb62708cb6a471cbd34f8a7bc575cad + +# 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: "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 c8f55f2..c1c298f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,9 +1,15 @@ { - "assignees": ["@sean.melissari"], - "baseBranches": ["development"], + "assignees": [ + "@sean.melissari" + ], + "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": "amazon/aws-cli", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "amazon/aws-cli", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file -- GitLab From 24bc2d0562abacf40ae74dc3b2abc99e54f169a3 Mon Sep 17 00:00:00 2001 From: "sean.melissari" Date: Thu, 10 Dec 2020 18:38:52 +0000 Subject: [PATCH 2/3] 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 d036377..44a967b 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "aws-cli" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "Universal Command Line Interface for Amazon Web Services." + org.opencontainers.image.description: "Universal Command Line Interface for Amazon Web Services." ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "Apache-2.0" + org.opencontainers.image.licenses: "Apache-2.0" ## URL to find more information on the image - # org.opencontainers.image.url: "https://github.com/aws/aws-cli" + org.opencontainers.image.url: "https://github.com/aws/aws-cli" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "Amazon" + org.opencontainers.image.vendor: "Amazon" org.opencontainers.image.version: "2.1.9" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "aws,cli" + mil.dso.ironbank.image.keywords: "aws,cli" ## 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: "aws" + mil.dso.ironbank.product.name: "aws" # List of resources to make available to the offline build context resources: -- GitLab From 6f8c3bb88f82a3c4d5188a3df4613bbd696b6a77 Mon Sep 17 00:00:00 2001 From: Sean Melissari Date: Thu, 10 Dec 2020 13:39:58 -0500 Subject: [PATCH 3/3] remove jenkinsfile --- Jenkinsfile | 2 -- download.yaml | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index f379cd1..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "2.1.9") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 338c6a4..0000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/amazon/aws-cli@sha256:9b9b831b4020d7cc62409148c5ad5ea7b0e621d48ac734381da12aba4baf5091" - tag: "amazon/aws-cli:2.1.9" -- GitLab