From 022556846169f35d8ff3999af54e25af8cf3733c Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Thu, 22 Apr 2021 09:44:41 -0700
Subject: [PATCH 1/2] Update GitLab to the 13.11.0 Minor Feature 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 07d4dbf..65f054b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GITLAB_VERSION=v13.10.3-ubi8
+ARG GITLAB_VERSION=v13.11.0-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 9d12443..5d6c5fc 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.10.3}
+TAG=${1:-13.11.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 7515295..75f0144 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.10.3"
+  - "13.11.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.10.3"
+  org.opencontainers.image.version: "13.11.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.10.3-ubi8/gitlab-ruby.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-ruby.tar.gz"
     filename: "gitlab-ruby.tar.gz"
     validation:
       type: "sha256"
-      value: "dd6471ff0d49a9ee06f9514e1b4d137e6fbcf14e564d7f2ecb02944d595b6176"
+      value: "8e6360d8d16ac3a5d22ee03761d7aa55e348059c240e51f8cdfb7b35ab5a8986"
-- 
GitLab


From aa04d969368e2f2216019e785df5d2a05e0c5589 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Thu, 22 Apr 2021 10:26:23 -0700
Subject: [PATCH 2/2] Drop labels from the dockerfile

---
 Dockerfile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 65f054b..3bf1a73 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,15 +10,6 @@ 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
-- 
GitLab