From 8f9a16ebee5f0b18aac93b54e70c95663a909439 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Sat, 22 Aug 2020 07:33:48 -0700
Subject: [PATCH] Update GitLab to the monthly 13.3.0 minor release

---
 Dockerfile             | 16 ++++++++++------
 Jenkinsfile            |  2 +-
 build-scripts/build.sh |  2 +-
 download.yaml          |  4 ++--
 scripts/geo-db-migrate |  4 ----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4a1003d..68b8214 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.2.0-ubi8
+ARG GITLAB_VERSION=v13.3.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.2.0
+ARG BASE_TAG=13.3.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -14,7 +14,9 @@ ARG DNF_OPTS
 
 RUN dnf clean all \
     && rm -r /var/cache/dnf \
-    && dnf ${DNF_OPTS} install -by --nodocs libicu tzdata uuid \
+    && dnf ${DNF_OPTS} install -by --nodocs \
+            libicu tzdata uuid \
+            libpng libjpeg-turbo zlib libtiff \
     && adduser -m ${GITLAB_USER} \
     && mkdir -p ${GITLAB_DATA}/{.upgrade-status,data,repo,config} \
     && chown -R ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_DATA} \
@@ -47,12 +49,14 @@ ENV EXECJS_RUNTIME=Disabled
 ENV CONFIG_TEMPLATE_DIRECTORY=/srv/gitlab/config
 ENV UPGRADE_STATUS_DIR=${GITLAB_DATA}/.upgrade-status
 
+# Set the path that bootsnap will use for cache
+ENV BOOTSNAP_CACHE_DIR=/srv/gitlab/bootsnap
 # Generate bootsnap cache
 RUN echo "Generating bootsnap cache"; \
     cd /srv/gitlab && \
-    su ${GITLAB_USER} -c "mkdir /srv/gitlab/tmp/"  && \
-    su ${GITLAB_USER} -c "ENABLE_BOOTSNAP=1 bin/rake about" && \
-    du -hs /srv/gitlab/tmp/cache/bootsnap-* ;
+    su ${GITLAB_USER} -c "mkdir ${BOOTSNAP_CACHE_DIR}"  && \
+    su ${GITLAB_USER} -c "ENABLE_BOOTSNAP=1 BOOTSNAP_CACHE_DIR=${BOOTSNAP_CACHE_DIR} bin/rake about" && \
+    du -hs ${BOOTSNAP_CACHE_DIR} ;
 # exit code of this command will be that of `du`
 
 VOLUME ${GITLAB_DATA} /var/log
diff --git a/Jenkinsfile b/Jenkinsfile
index 68393cd..fd78845 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.2.0")
+dccscrPipeline(version: "13.3.0")
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 729356b..2337c7c 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.3.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index 1467d28..1493acd 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-rails-ee.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.3.0-ubi8/gitlab-rails-ee.tar.gz"
     filename: "gitlab-rails-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "63dafae8af9bab1722f8f3efed4863ebab2bfd4f1f12e1c59cb355827f28bd7b"
+      value: "b3c0bb97046b7eb13ca364c1cc4352ae427693a37e2721170535a78ce996b315"
diff --git a/scripts/geo-db-migrate b/scripts/geo-db-migrate
index 7583f50..8dd780a 100755
--- a/scripts/geo-db-migrate
+++ b/scripts/geo-db-migrate
@@ -19,7 +19,3 @@ fi
 
 echo "Performing '${RAKE_TASK}'"
 /srv/gitlab/bin/rake ${RAKE_TASK} && STATUS=$? || STATUS=$?
-
-# Attempt to update the FDW
-echo "Performing refresh of foreign tables 'geo:db:refresh_foreign_tables'"
-/srv/gitlab/bin/rake geo:db:refresh_foreign_tables
-- 
GitLab