From 5904352b0997c320cf24ab75fe63a45f58243f8d Mon Sep 17 00:00:00 2001
From: ironbank-bot <ironbank-bot@dsop.io>
Date: Thu, 10 Dec 2020 01:05:25 +0000
Subject: [PATCH] Migrate to hardening_manifest.yaml

---
 Dockerfile              |  8 ------
 Jenkinsfile             |  3 ---
 download.yaml           |  6 -----
 hardening_manifest.yaml | 58 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 17 deletions(-)
 delete mode 100644 Jenkinsfile
 delete mode 100644 download.yaml
 create mode 100644 hardening_manifest.yaml

diff --git a/Dockerfile b/Dockerfile
index 8b7011d..50a6ccd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,14 +12,6 @@ ARG GITALY_SERVER_VERSION=v13.5.4
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
-LABEL source="https://gitlab.com/gitlab-org/gitaly" \
-      name="Gitaly" \
-      maintainer="GitLab Distribution Team" \
-      vendor="GitLab" \
-      version=${GITALY_SERVER_VERSION} \
-      release=${GITALY_SERVER_VERSION} \
-      summary="Gitaly is a Git RPC service for handling all the git calls made by GitLab." \
-      description="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
 
 ADD gitaly.tar.gz /
 
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index ec9c45a..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,3 +0,0 @@
-@Library('DCCSCR@master') _
-dccscrPipeline(version: "13.5.4")
-
diff --git a/download.yaml b/download.yaml
deleted file mode 100644
index fc780d3..0000000
--- a/download.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitaly.tar.gz"
-    filename: "gitaly.tar.gz"
-    validation:
-      type: "sha256"
-      value: "ad2c332fe8557c325949ae1035202e4e3e2cfb4be00136cfa3f3841bc4b2ed30"
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
new file mode 100644
index 0000000..980f60f
--- /dev/null
+++ b/hardening_manifest.yaml
@@ -0,0 +1,58 @@
+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "gitlab/gitlab/gitaly"
+
+# 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.5.4"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "gitlab/gitlab/git-base"
+  BASE_TAG: "13.6.0"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "gitaly"
+  ## 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.5.4"
+  ## 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: gitaly.tar.gz
+  url: http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitaly.tar.gz
+  validation:
+    type: sha256
+    value: ad2c332fe8557c325949ae1035202e4e3e2cfb4be00136cfa3f3841bc4b2ed30
+
+# 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