diff --git a/Dockerfile b/Dockerfile index 1abf40455e722a46d4c895b69b27b191796ec638..331431447e63668909808f495e80ddaed0c4047e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,16 +2,10 @@ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.2 -FROM openpolicyagent/opa:0.24.0 as base +FROM openpolicyagent/opa:0.26.0 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="openpolicyagent/opa" \ - org.opencontainers.image.description="The Open Policy Agent (OPA) is an open source project to policy-enable the service." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://github.com/open-policy-agent/opa" \ - org.opencontainers.image.version="0.24.0" \ - maintainer="cht@dsop.io" RUN dnf upgrade -y && \ dnf clean all && \ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 4aad141d797bbe88ac8a99911378d35d65d42912..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "0.24.0") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 8c7ce0088caf19aa954cb190fc39d532ad2de00a..0000000000000000000000000000000000000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/openpolicyagent/opa@sha256:dd8233c85e13ca42b057962faf5579732c8b2874e469fbb19cea3f11f7372fd9" - tag: "openpolicyagent/opa:0.24.0" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6bfc5159fe1e16abb8f8f37a73915bdd5d3ab126 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,50 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/openpolicyagent/opa" + +# 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: +- "0.26.0" +- "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: "opa" + # Human-readable description of the software packaged in the image + org.opencontainers.image.description: "Policy-based control for cloud native environments" + # 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://www.openpolicyagent.org/" + # Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "styra" + org.opencontainers.image.version: "0.26.0" + # Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "policy,control,cloud,administration" + # 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: "openpolicyagent" + +# List of resources to make available to the offline build context +resources: +- tag: openpolicyagent/opa:0.26.0 + url: docker://docker.io/openpolicyagent/opa@sha256:194124d6a0ef36a3f5fbf70aa5e84460969b2cb6fb1652d0c7016b8711c75519 + +# List of project maintainers +maintainers: +- email: "shen_vickie@bah.com" + # The name of the current container owner + name: "Vickie Shen" + # The gitlab username of the current container owner + username: "shen_vickie" + cht_member: true diff --git a/renovate.json b/renovate.json index df309a9ffae3443e567eda4ccae384280983fba9..e58980f0fffc72510c76bd7361a9269f7a626e59 100644 --- a/renovate.json +++ b/renovate.json @@ -1,9 +1,15 @@ { - "assignees": ["@vickie.shen"], - "baseBranches": ["development"], + "assignees": [ + "@vickie.shen" + ], + "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": "openpolicyagent/opa", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "openpolicyagent/opa", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file