From 19f6622233325c54391a195a18d3bb5eed3625ab Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Thu, 1 Jul 2021 20:21:54 +0000
Subject: [PATCH] Update GitLab to the 14.0.2 Security Release

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

diff --git a/Dockerfile b/Dockerfile
index b136981..ccc23f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GITLAB_VERSION=v14.0.0-ubi8
+ARG GITLAB_VERSION=v14.0.2-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=redhat/ubi/ubi8
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index d4a2e34..e98a851 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.0.0}
+TAG=${1:-14.0.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index fbaad2d..e1c024e 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,7 +5,7 @@ name: "gitlab/gitlab/gitlab-ruby"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.0.0"
+  - "14.0.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
@@ -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.0"
+  org.opencontainers.image.version: "14.0.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-v14.0.0-ubi8/gitlab-ruby.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-ruby.tar.gz"
     filename: "gitlab-ruby.tar.gz"
     validation:
       type: "sha256"
-      value: "62dfecf71cbfd837e323bf24a394f354fdc9a8083abadf2519e14c0ccfba88f6"
+      value: "f65bc035f456ba1fd1f8fb478544f2802f430483d673c2fb65a7d8ccb508c15d"
-- 
GitLab