From 069e070475edc7f3fbe2552da2de9b34d4c9882d Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Sun, 22 Aug 2021 08:04:09 -0700
Subject: [PATCH] Update GitLab to the 14.2.0 Feature Release

---
 Dockerfile              |  6 +++---
 README.md               |  2 +-
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml | 14 +++++++-------
 scripts/process-wrapper | 19 ++++++++++++++++---
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3249c46..9b6ae2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG GITLAB_VERSION=v14.1.2-ubi8
+ARG GITLAB_VERSION=v14.2.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/git-base
-ARG BASE_TAG=14.1.2
+ARG BASE_TAG=14.2.0
 
 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${GIT_IMAGE}
 
-ARG GITALY_SERVER_VERSION=v14.1.2
+ARG GITALY_SERVER_VERSION=v14.2.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/README.md b/README.md
index 690e27e..e09408a 100644
--- a/README.md
+++ b/README.md
@@ -37,5 +37,5 @@ Some of the GitLab containers are build ontop of previous containers, building t
   * gitaly
 - Phase 4
   * gitlab-sidekiq
-  * gitlab-task-runner
+  * gitlab-toolbox
   * gitlab-webservice
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 5c67780..4f1d45a 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.1.2}
+TAG=${1:-14.2.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 038013e..be2d63e 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitaly"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.1.2"
+  - "14.2.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/git-base"
-  BASE_TAG: "14.1.2"
+  BASE_TAG: "14.2.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Gitaly"
@@ -22,7 +22,7 @@ labels:
   org.opencontainers.image.url: "https://about.gitlab.com/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Gitlab"
-  org.opencontainers.image.version: "14.1.2"
+  org.opencontainers.image.version: "14.2.0"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
   ## This value can be "opensource" or "commercial"
@@ -47,13 +47,13 @@ maintainers:
     username: "adam.martin"
     cht_member: true
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitaly.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitaly.tar.gz"
     filename: "gitaly.tar.gz"
     validation:
       type: "sha256"
-      value: "f3829110210e4a77c2639d8ec225e4e615517b3120495a8ffd288697725dbcd1"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-logger.tar.gz"
+      value: "0c2007bac8f384696bb2f8151b678b3595da4441f322c6be4f031b07ca7744ba"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "afe1470c7f1d137bf568ce36bd617299926c91bd05bf0b94e409861b2d72af06"
+      value: "42e4fc9d762e631287e681d75de6a2d13d407457f3ddeee0f4671788a48f0434"
diff --git a/scripts/process-wrapper b/scripts/process-wrapper
index 91a8ce5..dd58473 100755
--- a/scripts/process-wrapper
+++ b/scripts/process-wrapper
@@ -3,11 +3,24 @@
 set -e
 
 GITALY_CONFIG_FILE="${GITALY_CONFIG_FILE:-$CONFIG_TEMPLATE_DIRECTORY/config.toml}"
+PRAEFECT_CONFIG_FILE="${PRAEFECT_CONFIG_FILE:-$CONFIG_TEMPLATE_DIRECTORY/config.toml}"
 
-echo "Starting Gitaly"
-/usr/local/bin/gitaly "$GITALY_CONFIG_FILE" >> /var/log/gitaly/gitaly.log 2>&1 &
+if [ "${USE_PRAEFECT_SERVICE:-0}" -eq 1 ]; then
+  echo "Starting Praefect"
 
-if [ "${USE_GITLAB_LOGGER-0}" -eq 1 ]; then
+  if [ "${PRAEFECT_AUTO_MIGRATE:-1}" -eq 1 ]; then
+    echo "Running migrations"
+    /usr/local/bin/praefect -config "$PRAEFECT_CONFIG_FILE" sql-migrate
+  fi
+
+  /usr/local/bin/praefect -config "$PRAEFECT_CONFIG_FILE" >> /var/log/gitaly/praefect.log 2>&1 &
+else
+  echo "Starting Gitaly"
+
+  /usr/local/bin/gitaly "$GITALY_CONFIG_FILE" >> /var/log/gitaly/gitaly.log 2>&1 &
+fi
+
+if [ "${USE_GITLAB_LOGGER:-0}" -eq 1 ]; then
     /usr/local/bin/gitlab-logger --json /var/log/gitaly
 elif command -v xtail >/dev/null; then
     xtail /var/log/gitaly
-- 
GitLab