From 54c725f79e77e91744a66ac6f507b03636b314e3 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Fri, 22 Jan 2021 07:42:26 -0800
Subject: [PATCH] Update GitLab to the 13.8.0 Feature Release

---
 Dockerfile              |  4 +--
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml | 57 +++++++++++++++++------------------------
 3 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c03e8e..e80d06c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.7.4-ubi8
+ARG GITLAB_VERSION=v13.8.0-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.4
+ARG BASE_TAG=13.8.0
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index cd2d6b4..b73da90 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.7.4}
+TAG=${1:-13.8.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 58726ac..18dc375 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -1,21 +1,16 @@
----
 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.4"
-- "latest"
-
+  - "13.8.0"
+  - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "13.7.4"
-
+  BASE_TAG: "13.8.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Task Runner"
@@ -27,38 +22,34 @@ 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.4"
+  org.opencontainers.image.version: "13.8.0"
   ## 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: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/gitlab-task-runner-ee.tar.gz
-  validation:
-    type: sha256
-    value: 551abf4b19c1e3c0732ab03174a75d84aed6f8f4bd039baaf0911d083bfb7f8d
-- filename: 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: 938506e3a8e963662685f471bc0631a39d78f35b523decab5e00d0fecad4c1ac
-
 # 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"
+  - 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"
+resources: 
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-task-runner-ee.tar.gz"
+    filename: "gitlab-task-runner-ee.tar.gz"
+    validation:
+      type: "sha256"
+      value: "206287f4b875209a1ae06d19c26c11dd08141bd1e8672cdce039ff0d56a2ae41"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-python.tar.gz"
+    filename: "gitlab-python.tar.gz"
+    validation:
+      type: "sha256"
+      value: "5a526905739dcc1a1afafe7c9de4367d2dd307f0c9104ad26e6faa5a66e86b35"
-- 
GitLab