From 907aea5a718e5aecc866d7cbc1ac0323ba1b13a8 Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 17 Mar 2021 21:11:27 +0000
Subject: [PATCH] Update GitLab to the 13.9.4 Security Release

---
 Dockerfile              | 11 ++++++++++-
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml |  8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fdd8a28..2df2d78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GITLAB_VERSION=v13.9.3-ubi8
+ARG GITLAB_VERSION=v13.9.4-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=redhat/ubi/ubi8
@@ -10,6 +10,15 @@ FROM ${UBI_IMAGE}
 
 ARG DNF_OPTS
 
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-ruby" \
+      name="GitLab Ruby" \
+      maintainer="GitLab Distribution Team" \
+      vendor="GitLab" \
+      version=${GITLAB_VERSION} \
+      release=${GITLAB_VERSION} \
+      summary="Base container for building GitLab application containers." \
+      description="Base container for building GitLab application containers."
+
 ADD gitlab-ruby.tar.gz /
 
 COPY scripts/ /scripts
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 8cf9ec3..3b8fec2 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.9.3}
+TAG=${1:-13.9.4}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 64b77c8..ed972f6 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.9.3"
+  - "13.9.4"
   - "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.9.3"
+  org.opencontainers.image.version: "13.9.4"
   ## 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.9.3-ubi8/gitlab-ruby.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.4-ubi8/gitlab-ruby.tar.gz"
     filename: "gitlab-ruby.tar.gz"
     validation:
       type: "sha256"
-      value: "61dc2767d5eee16876a5c847cd7fd08294fd8082fb89d6b1b1ed7237479204c6"
+      value: "1acaf8c26a276b4e444a5e1197643258a2bf63b83577de80c8fc86af21cb1ef1"
-- 
GitLab