From 957e54d0cacf5796474fb824d5ba07769994000c Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Tue, 22 Jun 2021 07:28:11 -0700
Subject: [PATCH] Update GitLab to the 14.0.0 Major Release

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

diff --git a/Dockerfile b/Dockerfile
index 3a47916..813ed52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,20 @@
-ARG GITLAB_VERSION=v13.12.2-ubi8
+ARG GITLAB_VERSION=v14.0.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.12.2
+ARG BASE_TAG=14.0.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${RUBY_IMAGE}
 
-ARG GITLAB_SHELL_VERSION=v13.18.0
+ARG GITLAB_SHELL_VERSION=v13.19.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
 ADD gitlab-shell.tar.gz /
 ADD gitlab-logger.tar.gz /usr/local/bin
+ADD gitlab-gomplate.tar.gz /
 
 COPY scripts/ /scripts/
 COPY sshd_config /etc/ssh/
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 90b9769..15b7527 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.12.2}
+TAG=${1:-14.0.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index e23622b..b369675 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:
-  - "13.12.2"
+  - "14.0.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "13.12.2"
+  BASE_TAG: "14.0.0"
 # 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: "13.12.2"
+  org.opencontainers.image.version: "14.0.0"
   ## 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,13 +43,18 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "9cbb7216327ffda46e3c79b9821ae763d7f10564ba2f55a84c47a71bee59a747"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-logger.tar.gz"
+      value: "b21c7cb6ade3e7302593f7e1c6dd8acb3643cd374a320cdfa9bd35738cfc6fa8"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "97af1354c573f5bbf45c70541e9dc27515a5c93cd8ffe28511ec8155907f38b0"
+      value: "6b25556f20a8639a7fae19d3737089f9b9f9c74fbc35562f8a9ca85dde307c69"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-gomplate.tar.gz"
+    filename: "gitlab-gomplate.tar.gz"
+    validation:
+      type: "sha256"
+      value: "f4464f8531b4370df41a08cbdf20ccc23ad6c083a5c375cb18de08052da4b06a"
-- 
GitLab