Merge branch 'release-gitlab-13-7-2' into 'development'

Update GitLab to the 13.7.2 Security Release

See merge request !52

Dockerfile

-ARG GITLAB_VERSION=v13.6.3-ubi8
+ARG GITLAB_VERSION=v13.7.2-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
-ARG BASE_TAG=13.6.3
+ARG BASE_TAG=13.7.2
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -12,15 +12,6 @@ ARG GITLAB_VERSION
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
-LABEL source="https://gitlab.com/gitlab-org/gitlab" \
-      name="GitLab Task Runner" \
-      maintainer="GitLab Distribution Team" \
-      vendor="GitLab" \
-      version=${GITLAB_VERSION} \
-      release=${GITLAB_VERSION} \
-      summary="Task Runner is an entry point for interaction with other containers in the cluster." \
-      description="Task Runner is an entry point for interaction with other containers in the cluster. It contains scripts for running Rake tasks, backup, restore, and tools to intract with object storage."
-
 ADD gitlab-task-runner-ee.tar.gz /
 ADD gitlab-python.tar.gz /
 

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "13.6.3")

build-scripts/build.sh

@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.6.3}
+TAG=${1:-13.7.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 

download.yaml

-resources:
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-task-runner-ee.tar.gz"
-    filename: "gitlab-task-runner-ee.tar.gz"
-    validation:
-      type: "sha256"
-      value: "98f62cd2c0e50e80187c5119c259311d720c4801b3e5cd9d1ccd5129d2532f2f"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-python.tar.gz"
-    filename: "gitlab-python.tar.gz"
-    validation:
-      type: "sha256"
-      value: "6fae28841db8c515045f85dfc74291f1d57fb9569ee63fe583ad2eabbdb70231"

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "gitlab/gitlab/gitlab-task-runner"
+
+# 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.7.2"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
+  BASE_TAG: "13.7.2"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "Gitlab Task Runner"
+  ## Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "Task Runner is an entry point for interaction with other containers in the cluster. It contains scripts for running Rake tasks, backup, restore, and tools to intract with object storage."
+  ## License(s) under which contained software is distributed
+  org.opencontainers.image.licenses: "MIT License"
+  ## URL to find more information on the image
+  org.opencontainers.image.url: "https://about.gitlab.com/"
+  ## Name of the distributing entity, organization or individual
+  org.opencontainers.image.vendor: "Gitlab"
+  org.opencontainers.image.version: "13.7.2"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
+  ## This value can be "opensource" or "commercial"
+  mil.dso.ironbank.image.type: "commercial"
+  ## Product the image belongs to for grouping multiple images
+  mil.dso.ironbank.product.name: "gitlab"
+
+
+# List of resources to make available to the offline build context
+resources:
+- filename: gitlab-task-runner-ee.tar.gz
+  url: http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.2-ubi8/gitlab-task-runner-ee.tar.gz
+  validation:
+    type: sha256
+    value: d18a9cbbd0d0b9f3019b81b51e01b749f390a1d466dcdbbcff7ac458efcf49a6
+- filename: gitlab-python.tar.gz
+  url: http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.2-ubi8/gitlab-python.tar.gz
+  validation:
+    type: sha256
+    value: 101df55159a1e40ec6ccd03bb5788f57d6192019e4a9f5889bc49fad821010af
+
+# 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: "DJ Mountney"
+#   # The gitlab username of the current container owner
+  username: "twk3"
+#   cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
+- name: "Al Fontaine"
+  username: "alfontaine"
+  email: "alan.fontaine@centauricorp.com"