From 6735dca2bf53b0f79ee5a7a84802e049d2a93df5 Mon Sep 17 00:00:00 2001 From: ironbank-bot Date: Thu, 10 Dec 2020 01:05:53 +0000 Subject: [PATCH 1/2] Migrate to hardening_manifest.yaml --- Jenkinsfile | 2 -- download.yaml | 6 ----- hardening_manifest.yaml | 58 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 8 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 download.yaml create mode 100644 hardening_manifest.yaml diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 8fe2522..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "13.6.0") diff --git a/download.yaml b/download.yaml deleted file mode 100644 index b9774bb..0000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-ruby.tar.gz" - filename: "gitlab-ruby.tar.gz" - validation: - type: "sha256" - value: "e8a59d83e3edad5c8833f7924ad7aa6e945f44c2e554eee05e2711d68e912146" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..52ea758 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,58 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "gitlab/gitlab/gitlab-ruby" + +# 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: +- "13.6.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: "gitlab-ruby" + ## 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: "13.6.0" + ## 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: +- filename: gitlab-ruby.tar.gz + url: http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-ruby.tar.gz + validation: + type: sha256 + value: e8a59d83e3edad5c8833f7924ad7aa6e945f44c2e554eee05e2711d68e912146 + +# 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: "dj@gitlab.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" -- GitLab From 159a52ff61d79a0458bfc2a03b4ba271ac8c6ba1 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Tue, 22 Dec 2020 16:10:11 +0000 Subject: [PATCH 2/2] Update hardening_manifest.yaml --- hardening_manifest.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 52ea758..89af306 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "gitlab/gitlab/gitlab-ruby" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "13.6.0" +- "13.6.3" - "latest" # Build args passed to Dockerfile ARGs @@ -20,28 +20,28 @@ args: labels: org.opencontainers.image.title: "gitlab-ruby" ## Human-readable description of the software packaged in the image - # org.opencontainers.image.description: "FIXME" + org.opencontainers.image.description: "gitlab-ruby base image" ## License(s) under which contained software is distributed - # org.opencontainers.image.licenses: "FIXME" + org.opencontainers.image.licenses: "MIT License" ## URL to find more information on the image - # org.opencontainers.image.url: "FIXME" + org.opencontainers.image.url: "https://about.gitlab.com/" ## Name of the distributing entity, organization or individual - # org.opencontainers.image.vendor: "FIXME" - org.opencontainers.image.version: "13.6.0" + org.opencontainers.image.vendor: "Gitlab" + org.opencontainers.image.version: "13.6.3" ## Keywords to help with search (ex. "cicd,gitops,golang") - # mil.dso.ironbank.image.keywords: "FIXME" + mil.dso.ironbank.image.keywords: "gitlab, git, gitops" ## This value can be "opensource" or "commercial" - # mil.dso.ironbank.image.type: "FIXME" + mil.dso.ironbank.image.type: "commercial" ## Product the image belongs to for grouping multiple images - # mil.dso.ironbank.product.name: "FIXME" + mil.dso.ironbank.product.name: "gitlab" # List of resources to make available to the offline build context resources: - filename: gitlab-ruby.tar.gz - url: http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-ruby.tar.gz + url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-ruby.tar.gz validation: type: sha256 - value: e8a59d83e3edad5c8833f7924ad7aa6e945f44c2e554eee05e2711d68e912146 + value: 5217ef00ebf996d2c05ada182313847f5a61da06ef668bc89c21d44520f2cef7 # List of project maintainers # FIXME: Fill in the following details for the current container owner in the whitelist @@ -49,10 +49,10 @@ resources: maintainers: - email: "dj@gitlab.com " # # The name of the current container owner -# name: "FIXME" + name: "DJ Mountney" # # The gitlab username of the current container owner -# username: "FIXME" + username: "twk3" # cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT -# - name: "FIXME" -# username: "FIXME" -# email: "FIXME" +- name: "Al Fontaine" + username: "alfontaine" + email: "alan.fontaine@centauricorp.com" -- GitLab