From 071f1f086d7d98178093fc8f927ccceb517638ed Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Tue, 13 Jul 2021 19:05:33 +0000
Subject: [PATCH] Update GitLab to the 14.0.5 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 5fd9bb1..95c6c99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v14.0.2-ubi8
+ARG GITLAB_VERSION=v14.0.5-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=14.0.2
+ARG BASE_TAG=14.0.5
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 690d43e..89f9d67 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.0.2}
+TAG=${1:-14.0.5}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 8139779..aa05369 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.0.2"
+  - "14.0.5"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "14.0.2"
+  BASE_TAG: "14.0.5"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Shell"
@@ -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: "14.0.2"
+  org.opencontainers.image.version: "14.0.5"
   ## 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-v14.0.2-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "2a5a29d82f6c7063845ed4a5e79dc7152b63cb047514c383b8a5a35d282a4b00"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-logger.tar.gz"
+      value: "bc540e190f952e500a11c952d407c6b582381de2d47e830cb2c60ddeb5d47a7d"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "48fdaff769c68ddecaeca5fe93ca09b01ee36ab2f9ee52e9d1870182591c0ed7"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-gomplate.tar.gz"
+      value: "7a889bef692990d4b7581b23c5a1f3a0b320ed3bb33c38bde30b5cc3afb72d63"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-gomplate.tar.gz"
     filename: "gitlab-gomplate.tar.gz"
     validation:
       type: "sha256"
-      value: "1c6b815c545657b8c7a40603f552473514f30d72a76808a0ab490f91a6825cfd"
+      value: "8e6aad0d7c5940bc8955aa2bb9f53954840e481e762236bec71a535913b02778"
-- 
GitLab