From 264f4169afe1a19031b2625b1eaed97c5778d998 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Sun, 22 Nov 2020 07:54:49 -0800
Subject: [PATCH] Update GitLab to the 13.6.0 Minor Release

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

diff --git a/Dockerfile b/Dockerfile
index 8b7011d..a135380 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG GITLAB_VERSION=v13.5.4-ubi8
+ARG GITLAB_VERSION=v13.6.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/git-base
-ARG BASE_TAG=13.5.4
+ARG BASE_TAG=13.6.0
 
 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${GIT_IMAGE}
 
-ARG GITALY_SERVER_VERSION=v13.5.4
+ARG GITALY_SERVER_VERSION=v13.6.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/Jenkinsfile b/Jenkinsfile
index ec9c45a..9d67926 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,3 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.5.4")
+dccscrPipeline(version: "13.6.0")
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 1a9bd67..c3e3051 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.5.4}
+TAG=${1:-13.6.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index fc780d3..9505cfd 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitaly.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitaly.tar.gz"
     filename: "gitaly.tar.gz"
     validation:
       type: "sha256"
-      value: "ad2c332fe8557c325949ae1035202e4e3e2cfb4be00136cfa3f3841bc4b2ed30"
+      value: "3402791ddb3d499c91a1d19cfda2db83b7c955c91e7e273ac895dcb20b60525c"
-- 
GitLab