From 27a0442e887ed8481bcffb8cab03f8946cc4591e Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Mon, 1 Feb 2021 23:19:19 +0000
Subject: [PATCH] Update GitLab to the 13.8.2 Security Release

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

diff --git a/Dockerfile b/Dockerfile
index d5147fc..266aaf3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.8.0-ubi8
+ARG GITLAB_VERSION=v13.8.2-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
-ARG BASE_TAG=13.8.0
+ARG BASE_TAG=13.8.2
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 76c0ef6..79231b8 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.8.0}
+TAG=${1:-13.8.2}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index b623fc9..3655ac0 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-sidekiq"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "13.8.0"
+  - "13.8.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "13.8.0"
+  BASE_TAG: "13.8.2"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Sidekiq"
@@ -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.0"
+  org.opencontainers.image.version: "13.8.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"
@@ -43,18 +43,18 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-sidekiq-ee.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-sidekiq-ee.tar.gz"
     filename: "gitlab-sidekiq-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "a70b346229082e0fb6d46196d6d40e03d474ad78d36b93697a33955cf07cbf91"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-python.tar.gz"
+      value: "8c156851a951dae8ffe34bcf064c5dd61008273e3f9edaf2b152a2d935d3541e"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "5a526905739dcc1a1afafe7c9de4367d2dd307f0c9104ad26e6faa5a66e86b35"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-logger.tar.gz"
+      value: "9dbafedfec8e6ae808661b8fa05b2c31378de35229f0978c391e2fecefced50a"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "639a99a9e1368f4684823b773414f498ad82c434b475401257ecef013e10c8bc"
+      value: "266a2f11d57220fa23b8b96d3c26ae3a83f1c5225f6ab23afa7a05addc11c4c6"
diff --git a/scripts/process-wrapper b/scripts/process-wrapper
index 1337e6e..ae1941a 100755
--- a/scripts/process-wrapper
+++ b/scripts/process-wrapper
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "${USE_GITLAB_LOGGER-0}" -eq 1]; then
+if [ "${USE_GITLAB_LOGGER-0}" -eq 1 ]; then
     /usr/local/bin/gitlab-logger /var/log/gitlab &
 else
     if command -v xtail >/dev/null; then
-- 
GitLab