From 01674d066a996db061a907f47d722835b72ae06d Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Mon, 1 Feb 2021 23:19:16 +0000
Subject: [PATCH] Update GitLab to the 13.8.2 Security Release

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

diff --git a/Dockerfile b/Dockerfile
index bc11d19..ca57f04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.8.0-ubi8
+ARG GITLAB_VERSION=v13.8.2-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.8.0
+ARG BASE_TAG=13.8.2
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 1a6e484..377dae3 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.8.0}
+TAG=${1:-13.8.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 2e2f30d..f7ad253 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/git-base"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "13.8.0"
+  - "13.8.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "13.8.0"
+  BASE_TAG: "13.8.2"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Git-Base"
@@ -22,7 +22,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.8.0"
+  org.opencontainers.image.version: "13.8.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"
@@ -43,8 +43,8 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/git-base.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/git-base.tar.gz"
     filename: "git-base.tar.gz"
     validation:
       type: "sha256"
-      value: "2dae72541af50e03fc2094011a5e3c7f5ff4440d6ba6e2767361e8bed415ce7a"
+      value: "e28928f6de3a60b07370d120bf5fc7004a0c73496b67d3ffbf1279ce36c5a3a6"
-- 
GitLab