From 7f1e004deab1f3d3487ec4e8fd4564c83733f673 Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 4 Aug 2021 14:36:47 +0000
Subject: [PATCH] Upgrade GitLab to the 14.1.2 Security Release

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

diff --git a/Dockerfile b/Dockerfile
index 11e0add..ce74698 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG GITLAB_VERSION=v14.1.0-ubi8
+ARG GITLAB_VERSION=v14.1.2-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=14.1.0
+ARG BASE_TAG=14.1.2
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${RUBY_IMAGE}
 
-ARG GITLAB_SHELL_VERSION=v13.19.0
+ARG GITLAB_SHELL_VERSION=v13.19.1
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 98320d9..240492f 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.1.0}
+TAG=${1:-14.1.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index cb747e9..be7a3b8 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.1.0"
+  - "14.1.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "14.1.0"
+  BASE_TAG: "14.1.2"
 # 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.1.0"
+  org.opencontainers.image.version: "14.1.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,18 +47,18 @@ maintainers:
     username: "adam.martin"
     cht_member: true
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "b751209699f715f1b16380811290b4c43320049eb74e0bc7b899ee4e60b5b598"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-logger.tar.gz"
+      value: "dab78e5894b98663ddaa5628e2f6d517e8e5f660faf1f408b9698b9f6a71ce8a"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "674bc89c3f6e577236feeadccc6adb3f380e014f8f474004ff96f93f3144eb28"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-gomplate.tar.gz"
+      value: "afe1470c7f1d137bf568ce36bd617299926c91bd05bf0b94e409861b2d72af06"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-gomplate.tar.gz"
     filename: "gitlab-gomplate.tar.gz"
     validation:
       type: "sha256"
-      value: "b73f3650e5634a1d24c593dd0ffe30ef107e01f77d29b2641c7ea12f3f9efe48"
+      value: "986efb42b63df897200953c5c39993cb58ccb60185d3ed6e1425a4ffe16f040b"
-- 
GitLab