From 3588d6f619508753aae2ca1a2df5bf7ea85620a6 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          | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 81ee8db..aeb64b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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/gitlab-rails
-ARG BASE_TAG=13.5.4
+ARG BASE_TAG=13.6.0
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -25,7 +25,7 @@ ADD gitlab-task-runner-ee.tar.gz /
 ADD gitlab-python.tar.gz /
 
 COPY scripts/bin/* /usr/local/bin/
-COPY scripts/lib/* /usr/lib/ruby/vendor_ruby/
+COPY scripts/lib/* ${LIBDIR}/ruby/vendor_ruby/
 
 RUN dnf clean all \
     && rm -r /var/cache/dnf \
diff --git a/Jenkinsfile b/Jenkinsfile
index 11e5b24..8fe2522 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @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 f022f9c..8e9332e 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 1c3d3b5..024737b 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,11 +1,11 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-task-runner-ee.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-task-runner-ee.tar.gz"
     filename: "gitlab-task-runner-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "5b190cb3193ba713e41528bd49708c9b90cb812d0082bacfaa65272ea6543beb"
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-python.tar.gz"
+      value: "6a6b6288103838be573230607d4b9bf27264936484a10f9e780464296ea2b34a"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "8cd4fbc021b59d139b335b77062c7f4fb0ee003fd9b4c8fd5e52754fe8b39e4f"
+      value: "8fd47f8a7e0389c92a1626a7c92a6cd53e8ab768fc6a058d1c52a4439342b761"
-- 
GitLab