From 88e5fd2c9fa5cd5ea62490813b31d3694dd149e9 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Thu, 22 Jul 2021 13:34:31 -0700
Subject: [PATCH 1/2] Update GitLab to the 14.1.0 Minor Feature Release

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

diff --git a/Dockerfile b/Dockerfile
index 95c6c99..11e0add 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v14.0.5-ubi8
+ARG GITLAB_VERSION=v14.1.0-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.5
+ARG BASE_TAG=14.1.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 89f9d67..98320d9 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.0.5}
+TAG=${1:-14.1.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index aa05369..ea149b2 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.5"
+  - "14.1.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "14.0.5"
+  BASE_TAG: "14.1.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: "14.0.5"
+  org.opencontainers.image.version: "14.1.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,18 +43,18 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "bc540e190f952e500a11c952d407c6b582381de2d47e830cb2c60ddeb5d47a7d"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-logger.tar.gz"
+      value: "b751209699f715f1b16380811290b4c43320049eb74e0bc7b899ee4e60b5b598"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "7a889bef692990d4b7581b23c5a1f3a0b320ed3bb33c38bde30b5cc3afb72d63"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-gomplate.tar.gz"
+      value: "674bc89c3f6e577236feeadccc6adb3f380e014f8f474004ff96f93f3144eb28"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-gomplate.tar.gz"
     filename: "gitlab-gomplate.tar.gz"
     validation:
       type: "sha256"
-      value: "8e6aad0d7c5940bc8955aa2bb9f53954840e481e762236bec71a535913b02778"
+      value: "b73f3650e5634a1d24c593dd0ffe30ef107e01f77d29b2641c7ea12f3f9efe48"
diff --git a/scripts/authorized_keys b/scripts/authorized_keys
index 48fc646..481e1a2 100755
--- a/scripts/authorized_keys
+++ b/scripts/authorized_keys
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 if [[ "$1" == "git" ]]; then
-  /srv/gitlab-shell/bin/authorized_keys $2
+  /srv/gitlab-shell/bin/gitlab-shell-authorized-keys-check git $1 $2
 fi
-- 
GitLab


From d64c339ff27d243937ab4cfea748dd61352e2383 Mon Sep 17 00:00:00 2001
From: Andersen Pinckney <andersen.pinckney@saberastro.com>
Date: Fri, 23 Jul 2021 16:55:50 +0000
Subject: [PATCH 2/2] Update hardening_manifest.yaml with additional assignee

---
 hardening_manifest.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index aa05369..fea1002 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -42,6 +42,10 @@ maintainers:
   - name: "Al Fontaine"
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
+  - email: "adam.martin@rancherfederal.com"
+    name: "Adam Martin"
+    username: "adam.martin"
+    cht_member: true
 resources: 
   - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
-- 
GitLab