From 872c16f948f53df5f4f7bb0d4d489276ecc9f1c2 Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Thu, 11 Feb 2021 19:12:33 +0000
Subject: [PATCH] Update GitLab to 13.8.4 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 bf8cc36..a7d9874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG GITLAB_VERSION=v13.8.2-ubi8
+ARG GITLAB_VERSION=v13.8.4-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.8.2
+ARG BASE_TAG=13.8.4
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${RUBY_IMAGE}
 
-ARG GITLAB_SHELL_VERSION=v13.15.0
+ARG GITLAB_SHELL_VERSION=v13.15.1
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 0fbb6e7..ba18164 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.8.2}
+TAG=${1:-13.8.4}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 23e1a15..590cf7f 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.8.2"
+  - "13.8.4"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "13.8.2"
+  BASE_TAG: "13.8.4"
 # 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.8.2"
+  org.opencontainers.image.version: "13.8.4"
   ## 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,13 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "f2c7e03c24496f4a9a99b6d462e34db21e9eff90b26424ee4f1333e0e29cd5dd"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-logger.tar.gz"
+      value: "5300a5d46c6ec53171ec125729a12b6f1e400b297dd6696fdf5d17f640773075"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "266a2f11d57220fa23b8b96d3c26ae3a83f1c5225f6ab23afa7a05addc11c4c6"
+      value: "e944dd0268a2f276c45e4f24f72358dd23f87945baaed154ed0c0165dd582cb6"
-- 
GitLab