From 07c0e61800f287cea4ed773c98fd75b3d09be5d4 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Thu, 14 May 2020 10:16:38 -0700
Subject: [PATCH] Update to the GitLab 12.10.5 security patch

---
 Dockerfile             | 8 ++++----
 Jenkinsfile            | 2 +-
 build-scripts/build.sh | 2 +-
 download.json          | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d32593c..a9b0083 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-ARG GITLAB_VERSION=v12.10.3-ubi8
+ARG GITLAB_VERSION=v12.10.5-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/git-base
-ARG BASE_TAG=12.10.3
+ARG BASE_TAG=12.10.5
 
-ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1
+ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.2
 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${UBI_IMAGE} AS builder
@@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}"
 
 FROM ${GIT_IMAGE}
 
-ARG GITALY_SERVER_VERSION=v12.10.3
+ARG GITALY_SERVER_VERSION=v12.10.5
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/Jenkinsfile b/Jenkinsfile
index bb3b582..6ad662e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,3 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "12.10.3")
+dccscrPipeline(version: "12.10.5")
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 65b165a..999759b 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-12.10.3}
+TAG=${1:-12.10.5}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.json b/download.json
index 7e43fe8..4966e1f 100644
--- a/download.json
+++ b/download.json
@@ -1,10 +1,10 @@
 { "resources":
 	[
-        { "url" : "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.3-ubi8.tar",
-          "filename": "ubi8-build-dependencies-v12.10.3-ubi8.tar",
+        { "url" : "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.5-ubi8.tar",
+          "filename": "ubi8-build-dependencies-v12.10.5-ubi8.tar",
           "validation": {
             "type": "sha256",
-            "value": "014daa3ea5084893124a48d6affca6b2d6cd5d50827f3027386824ae369f5767"
+            "value": "6b6518cf5c3641b20757d9b9c7aeb176377366a2160f283fb744d22758cd4a88"
           }
 		}
 ] }
-- 
GitLab