From cc05668fa8d8c35d494db0744d2cb1e925c106ff 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              | 13 +++++++++++--
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml | 10 +++++-----
 openshift.metadata      |  6 ++++++
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 openshift.metadata

diff --git a/Dockerfile b/Dockerfile
index f3d38d2..1b93d34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.10.3
+ARG BASE_TAG=13.11.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -12,6 +12,15 @@ ARG MAILROOM_VERSION=0.0.9
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-mailroom" \
+      name="GitLab Mailroom" \
+      maintainer="GitLab Distribution Team" \
+      vendor="GitLab" \
+      version=${MAILROOM_VERSION} \
+      release=${MAILROOM_VERSION} \
+      summary="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received." \
+      description="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received."
+
 ADD gitlab-mailroom.tar.gz /
 
 COPY scripts/ /scripts/
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index bc21aa8..780fb2e 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 6fb7cde..bf05b7b 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:
-  - "13.10.3"
+  - "13.11.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "13.10.3"
+  BASE_TAG: "13.11.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: "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-mailroom.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-mailroom.tar.gz"
     filename: "gitlab-mailroom.tar.gz"
     validation:
       type: "sha256"
-      value: "4be6f015520519a71131aa7bf23f341ccc7d8d361ccb6c66307d3e29bc50d06f"
+      value: "27769a917fdfb5951f5575f6bae6117ecc4d6e11076e225eaa5edfec917f17bd"
diff --git a/openshift.metadata b/openshift.metadata
new file mode 100644
index 0000000..f777fa0
--- /dev/null
+++ b/openshift.metadata
@@ -0,0 +1,6 @@
+io.openshift.tags=gitlab-mailroom
+io.openshift.wants=gitlab-webservice
+io.k8s.description=GitLab service container for mailroom.
+io.openshift.non-scalable=false
+io.openshift-min-memory=150Mi
+io.openshift.min-cpu=100m
-- 
GitLab


From 194174b0c6dfc5aa51d9d034a3b422dc5002ca0b 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 1b93d34..be2cb72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,6 @@ ARG MAILROOM_VERSION=0.0.9
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
-LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-mailroom" \
-      name="GitLab Mailroom" \
-      maintainer="GitLab Distribution Team" \
-      vendor="GitLab" \
-      version=${MAILROOM_VERSION} \
-      release=${MAILROOM_VERSION} \
-      summary="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received." \
-      description="A configuration based process that will idle on IMAP connections and execute a delivery method when a new message is received."
-
 ADD gitlab-mailroom.tar.gz /
 
 COPY scripts/ /scripts/
-- 
GitLab