From 787899155ede11c8597406bb0635c24c2d947f40 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Tue, 22 Dec 2020 07:39:26 -0800
Subject: [PATCH] Upgrade GitLab to the 13.7.0 Feature Release

---
 Dockerfile                   | 8 ++++----
 Jenkinsfile                  | 2 +-
 build-scripts/build.sh       | 2 +-
 download.yaml                | 4 ++--
 scripts/install-dependencies | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d9b80ba..d079e39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
-ARG GITLAB_VERSION=v13.6.3-ubi8
+ARG GITLAB_VERSION=v13.7.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.6.3
+ARG BASE_TAG=13.7.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${RUBY_IMAGE}
 
-ARG MAILROOM_VERSION=0.0.7
+ARG MAILROOM_VERSION=0.0.8
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
-LABEL source="https://gitlab.com/gitlab-org/gitlab-mail_room/" \
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-mailroom" \
       name="GitLab Mailroom" \
       maintainer="GitLab Distribution Team" \
       vendor="GitLab" \
diff --git a/Jenkinsfile b/Jenkinsfile
index d0a3425..58e7e3e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.6.3")
+dccscrPipeline(version: "13.7.0")
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index c646bf2..fd57668 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.6.3}
+TAG=${1:-13.7.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index c4bc13a..3c0cf06 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-mailroom.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-mailroom.tar.gz"
     filename: "gitlab-mailroom.tar.gz"
     validation:
       type: "sha256"
-      value: "115e056d3abe47183743ffb9bc53ea9a1ff331dbc882fb2dce943b02ad274ecb"
+      value: "0a77ef18faf6dc63d1b44383425d44eb5168d8ee2778995789b153a5398a204d"
diff --git a/scripts/install-dependencies b/scripts/install-dependencies
index f97e265..c97c67e 100755
--- a/scripts/install-dependencies
+++ b/scripts/install-dependencies
@@ -11,7 +11,7 @@ rm -rf /var/lib/apt/lists/*
 
 gem install gitlab-mail_room:${MAILROOM_VERSION} \
         charlock_holmes:0.7.6 \
-        redis:4.2.2 \
+        redis:4.2.5 \
         redis-namespace:1.6.0
 
 /build-scripts/cleanup-gems /usr/lib/ruby/gems
-- 
GitLab