Merge branch 'development' into 'master'

development

See merge request !16

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 && \

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline( version: "1.5.10")
\ No newline at end of file

download.yaml

----
-resources:
-  - url: "docker://docker.io/istio/galley@sha256:aabaeee9d544986110445800bbfbafd61cdeb97cc8a75dc9246498eeeb3e119b"
-    tag: "istio/galley:1.5.10"

hardening_manifest.yaml

+---
+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: "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: "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.5.10"
+  ## 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/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: "klepal_alexander@bah.com"
+  name: "Alexander Klepal"
+  username: "alexander.klepal"
+  cht_member: true

renovate.json

 {
-    "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=\"(?<currentValue>.*?)\""
-        ],
-        "depNameTemplate": "istio/galley",
-        "datasourceTemplate": "docker"
-      },
-      {
-        "fileMatch": ["^Jenkinsfile$"],
-        "matchStrings": [
-          "version:\\s+\"(?<currentValue>.*?)\""
-        ],
-        "depNameTemplate": "istio/galley",
-        "datasourceTemplate": "docker"
-      }
-    ]
-  }
-  
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "^Dockerfile$"
+      ],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/galley",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "istio/galley",
\ No newline at end of file
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": [
+        "^hardening_manifest.yaml$"
+      ],
+      "matchStrings": [
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
+      ],
+      "depNameTemplate": "istio/galley",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}
\ No newline at end of file