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

---
 Dockerfile              |  4 ++--
 README.md               |  2 +-
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 79ab6ca..65d5b52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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/gitlab-ruby
-ARG BASE_TAG=14.1.2
+ARG BASE_TAG=14.2.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/README.md b/README.md
index 4d2cc73..18f26da 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 22bef53..7c909b6 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 0b52219..0b9f2d6 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-mailroom"
 # 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/gitlab-ruby"
-  BASE_TAG: "14.1.2"
+  BASE_TAG: "14.2.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Mailroom"
@@ -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"
@@ -43,8 +43,8 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-mailroom.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-mailroom.tar.gz"
     filename: "gitlab-mailroom.tar.gz"
     validation:
       type: "sha256"
-      value: "65e8ec4168ccd0e62c8782151bfb7f5b04968c282b26e532f17539142618dbe8"
+      value: "60b1fdc325e30db6af39938045e4bb0167f67005a1d426cf3aab4e2c7a745f9f"
-- 
GitLab