From 6ceb782bf1c59a8b18c3eea1e39651cb1774a275 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Tue, 18 Aug 2020 14:02:05 -0700
Subject: [PATCH] Update to the GitLab 13.2.6 security patch

---
 Dockerfile                           | 4 ++--
 Jenkinsfile                          | 2 +-
 build-scripts/build.sh               | 2 +-
 download.yaml                        | 8 ++++----
 scripts/lib/object_storage_backup.rb | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0dee9f4..4400a85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.2.0-ubi8
+ARG GITLAB_VERSION=v13.2.6-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
-ARG BASE_TAG=13.2.0
+ARG BASE_TAG=13.2.6
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 68393cd..36a2940 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.2.0")
+dccscrPipeline(version: "13.2.6")
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index a8cf2ee..ff4b98b 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.2.0}
+TAG=${1:-13.2.6}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index ba3e85c..54d312a 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,11 +1,11 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-task-runner-ee.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-task-runner-ee.tar.gz"
     filename: "gitlab-task-runner-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "ed7a08756e6c81546ac62bd8f64022d15fac6e2d5ae263e4bbfec36a94a0e564"
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-python.tar.gz"
+      value: "ece65686b4ec4bdc6506b569a9af77b8fa17e7a3463c3cae13ce95e84ebad5fc"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "de90479c921f72b62b7fc2ad3d203f64eee3c47027aca44547a5e1350b633686"
+      value: "df96fd3d2f0acef9edfdf1b8843deb754a6713fc2009270563f671dc0f907628"
diff --git a/scripts/lib/object_storage_backup.rb b/scripts/lib/object_storage_backup.rb
index fd8dae6..67a78a4 100644
--- a/scripts/lib/object_storage_backup.rb
+++ b/scripts/lib/object_storage_backup.rb
@@ -73,11 +73,11 @@ class ObjectStorageBackup
   end
 
   def upload_to_object_storage(source_path)
+    dir_name = File.basename(source_path)
     if @backend == "s3"
-      dir_name = File.basename(source_path)
       cmd = %W(s3cmd --stop-on-error sync #{source_path}/ s3://#{@remote_bucket_name}/#{dir_name}/)
     elsif @backend == "gcs"
-      cmd = %W(gsutil -m rsync -r #{source_path}/ gs://#{@remote_bucket_name})
+      cmd = %W(gsutil -m rsync -r #{source_path}/ gs://#{@remote_bucket_name}/#{dir_name})
     end
 
     output, status = run_cmd(cmd)
-- 
GitLab