From af4e92d205b4ce1abbeba1a8e431a9ab965c6e78 Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 2 Jun 2021 14:28:39 +0000
Subject: [PATCH] Update GitLab to the 13.12.2 Security Release

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

diff --git a/Dockerfile b/Dockerfile
index f96eb41..1f81031 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.12.0-ubi8
+ARG GITLAB_VERSION=v13.12.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.12.0
+ARG BASE_TAG=13.12.2
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 80f8bf2..4e6a0ba 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.12.0}
+TAG=${1:-13.12.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 0551684..745d94c 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-sidekiq"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "13.12.0"
+  - "13.12.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "13.12.0"
+  BASE_TAG: "13.12.2"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Sidekiq"
@@ -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.12.0"
+  org.opencontainers.image.version: "13.12.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,18 +43,18 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.0-ubi8/gitlab-sidekiq-ee.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-sidekiq-ee.tar.gz"
     filename: "gitlab-sidekiq-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "a5f6b805c0fbe0826ff7b382a954e23546550320a1f9b4a65d66b5d253a99109"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.0-ubi8/gitlab-python.tar.gz"
+      value: "56b6fd58e8db1ceca934e63b01f395df9480718f0523297d4dc554baa8a66a0b"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "1326de3e530204bf98181de17d197ddb47aa4c429a4da9c318dfff9180df34ed"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.0-ubi8/gitlab-logger.tar.gz"
+      value: "504cc701f686141196608dbd60aa23150d1e8c1b14564e6bcd6b5bdbb1ece21d"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "85d89e8ce9f7ec62ff615c597b8ae1e94078e0d2e1a68dd940c22ac5eb548be9"
+      value: "97af1354c573f5bbf45c70541e9dc27515a5c93cd8ffe28511ec8155907f38b0"
-- 
GitLab