diff --git a/Dockerfile b/Dockerfile index 72469c520263b3c4885af72508c7351f617d78df..954aa5f467f748052c3921a050830cd382ded87b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,6 @@ FROM istio/istioctl:1.6.14 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="istioctl" \ - org.opencontainers.image.description="Istio configuration command line utility." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://istio.io" \ - org.opencontainers.image.version="1.6.14" \ - maintainer="cht@dsop.io" COPY --from=base /usr/local/bin/istioctl /usr/local/bin/istioctl diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1b23fc7de07949eed6dbfd9a77148d6d6ab3f5e8..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.6.14") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index c292e741a9880ad542e850a4555f6f21d241851a..0000000000000000000000000000000000000000 --- a/download.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -resources: - - url: "docker://docker.io/istio/istioctl@sha256:d327f24e4b4a2e905b1ea42c2baec3c44a90c83bca54fd5aee14759053442a84" - tag: "istio/istioctl:1.6.14" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c10415bdd1bc63357c547b8e868ff047189b8700 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,51 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/istio-1.6/istioctl-1.6" + +# 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: +- "1.6.14" +- "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: "istioctl-1.6" + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "The istioctl tool is a configuration command line utility that allows service operators to debug and diagnose their Istio service mesh deployment" + ## 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://istio.io/" + ## Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "opensource" + org.opencontainers.image.version: "1.6.14" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "istio" + ## 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: "istio" + + +# List of resources to make available to the offline build context +resources: +- tag: istio/istioctl:1.6.14 + url: docker://docker.io/istio/istioctl@sha256:d327f24e4b4a2e905b1ea42c2baec3c44a90c83bca54fd5aee14759053442a84 + +# 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: "klepal_alexander@bah.com" + name: "Alexander Klepal" + username: "alexander.klepal" + cht_member: true diff --git a/renovate.json b/renovate.json index 8dc814edb0e239ab04aa776df77059ee9fc479fb..3d73f7cabde1df2ca0b4c046a1b96933ec0543f8 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,18 @@ { - "assignees": ["@gavin.scallon"], - "baseBranches": ["development"], + "assignees": [ + "@gavin.scallon" + ], + "baseBranches": [ + "development" + ], "packageRules": [ { - "datasources": ["docker"], - "packageNames": ["istio/istioctl"], + "datasources": [ + "docker" + ], + "packageNames": [ + "istio/istioctl" + ], "separateMinorPatch": true, "minor": { "enabled": false @@ -13,7 +21,9 @@ ], "regexManagers": [ { - "fileMatch": ["^Dockerfile$"], + "fileMatch": [ + "^Dockerfile$" + ], "matchStrings": [ "version=\"(?.*?)\"" ], @@ -21,12 +31,24 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/istioctl", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "istio/istioctl", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file