From 9c4f2d510afc974659bd05cb9eed38fb37100e0e Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Tue, 31 Aug 2021 11:00:52 -0700
Subject: [PATCH] Update GitLab to the 14.2.2 Security Release

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

diff --git a/Dockerfile b/Dockerfile
index 198541d..ee43157 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v14.2.0-ubi8
+ARG GITLAB_VERSION=v14.2.2-ubi8
 
-ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
-ARG BASE_TAG=14.2.0
+ARG BASE_TAG=14.2.2
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index b069fac..f71fe4c 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.2.0}
+TAG=${1:-14.2.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 89725c0..9f081db 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-toolbox"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.2.0"
+  - "14.2.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "14.2.0"
+  BASE_TAG: "14.2.2"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Toolbox"
@@ -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.2.0"
+  org.opencontainers.image.version: "14.2.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"
@@ -47,13 +47,13 @@ maintainers:
     username: "adam.martin"
     cht_member: true
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-toolbox-ee.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.2-ubi8/gitlab-toolbox-ee.tar.gz"
     filename: "gitlab-toolbox-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "d0b2020e9ba41367ea3bb36e1fabc924ca7fb8241224e386924f2822aa5a44a4"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-python.tar.gz"
+      value: "5e260cc145784ab07bb7a73e0bce1c66f65f82bee126b93ac469bfabbd8e2aa0"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.2-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "c7c279f90687febbfb537c17f43b6db9dc0d1916feb7e99bdd40c17e61fe0064"
+      value: "3d68852ce7916f75bd8f6102ef894f0ae4453e87b4de7056a4a5fbd458efc66c"
-- 
GitLab