From 9db904b24993f8d91fb3961f7db8d1cd5eb473cf Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Wed, 10 Jun 2020 14:21:07 -0700
Subject: [PATCH] Update GitLab to the 13.0.6 Security patch

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

diff --git a/Dockerfile b/Dockerfile
index da6d312..776dfdc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.0.4-ubi8
+ARG GITLAB_VERSION=v13.0.6-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/git-base
-ARG BASE_TAG=13.0.4
+ARG BASE_TAG=13.0.6
 
 ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.2
 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
@@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}"
 
 FROM ${GIT_IMAGE}
 
-ARG GITALY_SERVER_VERSION=v13.0.4
+ARG GITALY_SERVER_VERSION=v13.0.6
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 107d946..a372f17 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,3 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.0.4")
+dccscrPipeline(version: "13.0.6")
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index d932f4a..fc7700d 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.0.4}
+TAG=${1:-13.0.6}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.json b/download.json
index 0be07bd..417b23f 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-v13.0.4-ubi8.tar",
-          "filename": "ubi8-build-dependencies-v13.0.4-ubi8.tar",
+        { "url" : "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.0.6-ubi8.tar",
+          "filename": "ubi8-build-dependencies-v13.0.6-ubi8.tar",
           "validation": {
             "type": "sha256",
-            "value": "3ed3236f0191941c9b97580aa30d75d109257a6716daee5601cf26648a6eca25"
+            "value": "f9fb8dfbf6a845c24b26a5b18c5e0c6b5b474a61f812367f89afd2913788abee"
           }
 		}
 ] }
-- 
GitLab