diff --git a/Dockerfile b/Dockerfile index 274dcafa4f659a476251434cfae5ae4afe2cb65f..6a480977783ad4eaac16116b03cfdd36f2bbdd1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,10 @@ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.3 -FROM amazon/aws-cli:2.1.7 as cli +FROM amazon/aws-cli:2.1.27 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 RUN groupadd -g 1001 awscli && \ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 46e7bed711508f111ccbee0217efd2c013162cef..0000000000000000000000000000000000000000 --- 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 69a89a528386bf6c20c797703df6182a5c951b23..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..d2e58beb12df03731bfe607e431e44f81aa5c47d --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,48 @@ +--- +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.27" +- "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: "Universal Command Line Interface for Amazon Web Services." + ## License(s) under which contained software is distributed + 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" + ## Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "Amazon" + org.opencontainers.image.version: "2.1.27" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "aws,cli" + ## 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: "aws" + +# List of resources to make available to the offline build context +resources: +- url: "docker://docker.io/amazon/aws-cli@sha256:219d2ec9325b2d276a3dc2ecb3ebe7b736864956fa240f38b344676b145ed007" + tag: "amazon/aws-cli:2.1.27" + +# List of project maintainers +maintainers: +- name: "Sean Melissari" + username: "sean.melissari" + email: "melissari_sean@bah.com" + cht_member: true diff --git a/renovate.json b/renovate.json index c8f55f2c1638870c2ee681f83e19554d29198016..c1c298f9ca95d7e3fea02b8d0c7814a940ff776a 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