From 4fcbb5f2863d205f4a922dcf3083e67066d3f36c Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Thu, 14 Jan 2021 13:41:12 +0000
Subject: [PATCH 1/3] Update Gitlab to 13.7.4 Security Release

---
 Dockerfile             | 4 ++--
 build-scripts/build.sh | 2 +-
 download.yaml          | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 download.yaml

diff --git a/Dockerfile b/Dockerfile
index a14b8d5..219a22d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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-ruby
-ARG BASE_TAG=13.7.2
+ARG BASE_TAG=13.7.4
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index b33d970..a6684ab 100755
--- a/build-scripts/build.sh
+++ b/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:-""}
 
diff --git a/download.yaml b/download.yaml
new file mode 100644
index 0000000..7dda49a
--- /dev/null
+++ b/download.yaml
@@ -0,0 +1,6 @@
+resources:
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/git-base.tar.gz"
+    filename: "git-base.tar.gz"
+    validation:
+      type: "sha256"
+      value: "ca2a496a0848cf6e0f45d74c3c5eccc823fd72087335e8559a422749aa3826dc"
-- 
GitLab


From 921b07d40858e92be73804cf0259a41827620374 Mon Sep 17 00:00:00 2001
From: Al Fontaine <alan.fontaine@centauricorp.com>
Date: Fri, 15 Jan 2021 19:54:26 +0000
Subject: [PATCH 2/3] Update hardening_manifest.yaml

---
 hardening_manifest.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index c6ca711..013bc10 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,13 +8,13 @@ name: "gitlab/gitlab/git-base"
 # 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-ruby"
-  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,10 +39,10 @@ labels:
 # List of resources to make available to the offline build context
 resources:
 - filename: git-base.tar.gz
-  url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.2-ubi8/git-base.tar.gz
+  url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/git-base.tar.gz
   validation:
     type: sha256
-    value: 301f19f4cce5e44053a948e0bddd33ae4f582140950f90bf09d54a204d4393f9
+    value: ca2a496a0848cf6e0f45d74c3c5eccc823fd72087335e8559a422749aa3826dc
 
 # List of project maintainers
 # FIXME: Fill in the following details for the current container owner in the whitelist
-- 
GitLab


From 006144579d7b746e24d1441becd71dddfb50e843 Mon Sep 17 00:00:00 2001
From: Al Fontaine <alan.fontaine@centauricorp.com>
Date: Fri, 15 Jan 2021 19:54:40 +0000
Subject: [PATCH 3/3] Delete download.yaml

---
 download.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 download.yaml

diff --git a/download.yaml b/download.yaml
deleted file mode 100644
index 7dda49a..0000000
--- a/download.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resources:
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/git-base.tar.gz"
-    filename: "git-base.tar.gz"
-    validation:
-      type: "sha256"
-      value: "ca2a496a0848cf6e0f45d74c3c5eccc823fd72087335e8559a422749aa3826dc"
-- 
GitLab