diff --git a/Dockerfile b/Dockerfile index 8bdfb9baa17adff493e1f9c68d2cd7042ded98cf..1197acaf6e0df0c6de91075e6e05bb1e40e7d754 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.3 +ARG BASE_TAG=8.4 -FROM amazon/aws-cli:2.2.5 as cli +FROM amazon/aws-cli:2.2.7 as cli FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 672cf614228964e375e571c2011e018d2fa9d34b..9e20a319b98dcc426ea71d09bde3c52c0c1a9019 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,13 +8,13 @@ name: "opensource/amazon/aws-cli" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "2.2.5" +- "2.2.7" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" - BASE_TAG: "8.3" + BASE_TAG: "8.4" # Docker image labels labels: @@ -27,7 +27,7 @@ labels: 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.2.5" + org.opencontainers.image.version: "2.2.7" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "aws,cli" ## This value can be "opensource" or "commercial" @@ -37,8 +37,8 @@ labels: # List of resources to make available to the offline build context resources: -- url: "docker://docker.io/amazon/aws-cli@sha256:e2dd93a260d207246cbfd8ea305b560b72e094a1a410ec5dfe90328dd386d0a7" - tag: "amazon/aws-cli:2.2.5" +- url: "docker://docker.io/amazon/aws-cli@sha256:24819de007482ea6d62e5d634c8296363595e4d72dc3acc1f061f465b506e700" + tag: "amazon/aws-cli:2.2.7" # List of project maintainers maintainers: diff --git a/renovate.json b/renovate.json index c1c298f9ca95d7e3fea02b8d0c7814a940ff776a..a7ed1bb519afd7eb4b88a11aa0b2ce4668fc33c2 100644 --- a/renovate.json +++ b/renovate.json @@ -5,17 +5,9 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "amazon/aws-cli", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -37,4 +29,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}