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

Update GitLab to the 13.7.4 Security Release

See merge request !53

Dockerfile

-ARG GITLAB_VERSION=v13.7.2-ubi8
+ARG GITLAB_VERSION=v13.7.4-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
-ARG BASE_TAG=13.7.2
+ARG BASE_TAG=13.7.4
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -12,6 +12,15 @@ ARG GITLAB_VERSION
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-task-runner" \
+      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 /
 

build-scripts/build.sh

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

hardening_manifest.yaml

@@ -8,13 +8,13 @@ name: "gitlab/gitlab/gitlab-task-runner"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "13.7.2"
+- "13.7.4"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "13.7.2"
+  BASE_TAG: "13.7.4"
 
 # Docker image labels
 labels:
@@ -27,7 +27,7 @@ labels:
   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"
+  org.opencontainers.image.version: "13.7.4"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
   ## This value can be "opensource" or "commercial"
@@ -39,15 +39,15 @@ labels:
 # 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
+  url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/gitlab-task-runner-ee.tar.gz
   validation:
     type: sha256
-    value: d18a9cbbd0d0b9f3019b81b51e01b749f390a1d466dcdbbcff7ac458efcf49a6
+    value: 551abf4b19c1e3c0732ab03174a75d84aed6f8f4bd039baaf0911d083bfb7f8d
 - filename: gitlab-python.tar.gz
-  url: http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.2-ubi8/gitlab-python.tar.gz
+  url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/gitlab-python.tar.gz
   validation:
     type: sha256
-    value: 101df55159a1e40ec6ccd03bb5788f57d6192019e4a9f5889bc49fad821010af
+    value: 938506e3a8e963662685f471bc0631a39d78f35b523decab5e00d0fecad4c1ac
 
 # List of project maintainers
 # FIXME: Fill in the following details for the current container owner in the whitelist