From e47a72eb474adac2fc1c07a812d72073e15ae52d Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Tue, 22 Jun 2021 07:28:11 -0700
Subject: [PATCH] Update GitLab to the 14.0.0 Major Release

---
 Dockerfile              |  2 +-
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml |  8 ++++----
 scripts/entrypoint.sh   |  2 +-
 scripts/exec-env        | 14 ++++++++++++++
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100755 scripts/exec-env

diff --git a/Dockerfile b/Dockerfile
index 2af2bad..b136981 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GITLAB_VERSION=v13.12.2-ubi8
+ARG GITLAB_VERSION=v14.0.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=redhat/ubi/ubi8
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 4074cbb..d4a2e34 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.12.2}
+TAG=${1:-14.0.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 4f1155b..fbaad2d 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,7 +5,7 @@ name: "gitlab/gitlab/gitlab-ruby"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "13.12.2"
+  - "14.0.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
@@ -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: "13.12.2"
+  org.opencontainers.image.version: "14.0.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"
@@ -43,8 +43,8 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-ruby.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-ruby.tar.gz"
     filename: "gitlab-ruby.tar.gz"
     validation:
       type: "sha256"
-      value: "819488e37214635287cc59e0ebc2860c02f4e1831320c5bebe939631be5f1bab"
+      value: "62dfecf71cbfd837e323bf24a394f354fdc9a8083abadf2519e14c0ccfba88f6"
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index 3db699b..280c2fb 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -4,4 +4,4 @@ set -xe
 
 /scripts/set-config "${CONFIG_TEMPLATE_DIRECTORY}" "${CONFIG_DIRECTORY:=$CONFIG_TEMPLATE_DIRECTORY}"
 
-exec "$@"
+exec /scripts/exec-env "$@"
diff --git a/scripts/exec-env b/scripts/exec-env
new file mode 100755
index 0000000..7130888
--- /dev/null
+++ b/scripts/exec-env
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+ENVIRONMENT_DIR=/etc/gitlab/environment
+if [ -d $ENVIRONMENT_DIR ]; then
+  # find all the files, export their content under their name.
+  for f in $(find -P $ENVIRONMENT_DIR -maxdepth 1 -type f) ; do
+    size=$(stat -c%s "$f")
+    if [ "$size" -gt 0 ]; then
+      export $(basename "$f")=$(cat "$f")
+    fi
+  done
+fi
+
+exec "$@"
\ No newline at end of file
-- 
GitLab