From 6ed8a467861ac5608fbf0a046e89a07b39abda21 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:16:25 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Dockerfile | 6 --- Jenkinsfile | 2 - download.yaml | 4 -- hardening_manifest.yaml | 55 +++++++++++++++++++++++++++ renovate.json | 83 ++++++++++++++++++++++++++--------------- 5 files changed, 107 insertions(+), 43 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Dockerfile b/Dockerfile index f7a3795..1d07075 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,12 +8,6 @@ FROM istio/galley:1.5.10 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -LABEL org.opencontainers.image.title="galley" \ - org.opencontainers.image.description="Istio Galley provides configuration management services for Istio." \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.url="https://istio.io" \ - org.opencontainers.image.version="1.5.10" \ - maintainer="cht@dsop.io" COPY --from=base /usr/local/bin/ /usr/local/bin/ RUN dnf update -y && \ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 9c65592..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline( version: "1.5.10") \ No newline at end of file diff --git a/download.yaml b/download.yaml deleted file mode 100644 index 558ddda..0000000 --- a/download.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -resources: - - url: "docker://docker.io/istio/galley@sha256:aabaeee9d544986110445800bbfbafd61cdeb97cc8a75dc9246498eeeb3e119b" - tag: "istio/galley:1.5.10" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..98e9cf7 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,55 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "opensource/istio-1.5/galley-1.5" + +# 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.5.10" +- "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: "galley-1.5" + ## 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: "1.5.10" + ## 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: istio/galley:1.5.10 + url: docker://docker.io/istio/galley@sha256:aabaeee9d544986110445800bbfbafd61cdeb97cc8a75dc9246498eeeb3e119b + +# 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: "gavin.scallon@parsons.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 50cb2dc..341ee58 100644 --- a/renovate.json +++ b/renovate.json @@ -1,33 +1,54 @@ { - "assignees": ["@gavin.scallon"], - "baseBranches": ["development"], - "packageRules": [ - { - "datasources": ["docker"], - "packageNames": ["istio/galley"], - "separateMinorPatch": true, - "minor": { - "enabled": false - } + "assignees": [ + "@gavin.scallon" + ], + "baseBranches": [ + "development" + ], + "packageRules": [ + { + "datasources": [ + "docker" + ], + "packageNames": [ + "istio/galley" + ], + "separateMinorPatch": true, + "minor": { + "enabled": false } - ], - "regexManagers": [ - { - "fileMatch": ["^Dockerfile$"], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "istio/galley", - "datasourceTemplate": "docker" - }, - { - "fileMatch": ["^Jenkinsfile$"], - "matchStrings": [ - "version:\\s+\"(?.*?)\"" - ], - "depNameTemplate": "istio/galley", - "datasourceTemplate": "docker" - } - ] - } - \ No newline at end of file + } + ], + "regexManagers": [ + { + "fileMatch": [ + "^Dockerfile$" + ], + "matchStrings": [ + "version=\"(?.*?)\"" + ], + "depNameTemplate": "istio/galley", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/galley", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "tags:\\s+-\\s+\"(?.+?)\"" + ], + "depNameTemplate": "istio/galley", + "datasourceTemplate": "docker" + } + ] +} \ No newline at end of file -- GitLab From 4b64f6f0bbdcfd19d7d55df5694cb2b0631f11f0 Mon Sep 17 00:00:00 2001 From: "alexander.klepal" Date: Fri, 11 Dec 2020 21:03:52 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 98e9cf7..c0234a5 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -20,20 +20,20 @@ args: labels: org.opencontainers.image.title: "galley-1.5" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "Gallery takes user-specified configurations for Istio and converts them into valid configurations for the other control plane components" ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "Apache-2.0" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://istio.io/" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" + org.opencontainers.image.vendor: "opensource" org.opencontainers.image.version: "1.5.10" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "istio" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "opensource" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.product.name: "istio" # List of resources to make available to the offline build context resources: @@ -44,12 +44,7 @@ resources: # FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Include any other vendor information if applicable maintainers: -- email: "gavin.scallon@parsons.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" +- email: "klepal_alexander@bah.com" + name: "Alexander Klepal" + username: "alexander.klepal" + cht_member: true -- GitLab