Merge branch 'development' into 'master'

Update gitlab to master

See merge request !51

Dockerfile

-ARG GITLAB_VERSION=v17.8.1-ubi
+ARG GITLAB_VERSION=v17.8.2-ubi
 ARG BASE_REGISTRY=registry1.dso.mil/ironbank
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=17.8.1
+ARG BASE_TAG=17.8.2
 ARG UBI_TAG=9.5
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:${BASE_TAG}

build-scripts/build.sh

@@ -6,7 +6,7 @@ set -euxo pipefail
 
 REGISTRY=${1:-}
 REPOSITORY=${2:-"$(basename "$(builtin cd "$(dirname "$0")/.."; pwd)")"}
-TAG=${3:-17.8.1}
+TAG=${3:-17.8.2}
 
 DOCKER_BUILD="${DOCKER_BUILD:-docker build}"
 DOCKER_OPTS=${DOCKER_OPTS:-""}

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:
-  - "17.8.1"
+  - "17.8.2"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "17.8.1"
+  BASE_TAG: "17.8.2"
   UBI_TAG: "9.5"
 # Docker image labels
 labels:
@@ -23,7 +23,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: "17.8.1"
+  org.opencontainers.image.version: "17.8.2"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
   ## This value can be "opensource" or "commercial"
@@ -50,8 +50,8 @@ maintainers:
     email: "help@dsop.io"
     cht_member: true
 resources: 
-  - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.8.1-ubi/gitlab-mailroom.tar.gz"
+  - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.8.2-ubi/gitlab-mailroom.tar.gz"
     filename: "gitlab-mailroom.tar.gz"
     validation:
       type: "sha256"
-      value: "ebeb755d1f13b9f63f80303bf984c135717b8722d116bce17783dfc47a81be5e"
+      value: "9cff8f4147f255b2cb1d5675c98eddf50aabfc4fdac6e5d778822cea2fc5d848"