From e6bd78cc6490eaebeb715a5148967dc72e5fe9d4 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Thu, 22 Apr 2021 09:44:40 -0700
Subject: [PATCH 1/3] Update GitLab to the 13.11.0 Minor Feature Release

---
 Dockerfile              | 15 ++++++++++++---
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml | 10 +++++-----
 openshift.metadata      |  6 ++++++
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 openshift.metadata

diff --git a/Dockerfile b/Dockerfile
index 0f807b4..7682e04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,26 @@
-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/git-base
-ARG BASE_TAG=13.10.3
+ARG BASE_TAG=13.11.0
 
 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${GIT_IMAGE}
 
-ARG GITALY_SERVER_VERSION=v13.10.3
+ARG GITALY_SERVER_VERSION=v13.11.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitaly" \
+      name="Gitaly" \
+      maintainer="GitLab Distribution Team" \
+      vendor="GitLab" \
+      version=${GITALY_SERVER_VERSION} \
+      release=${GITALY_SERVER_VERSION} \
+      summary="Gitaly is a Git RPC service for handling all the git calls made by GitLab." \
+      description="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
+
 ADD gitaly.tar.gz /
 
 COPY scripts/ /scripts/
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 9e0c97c..f8dec75 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 2abfa06..5b2afd0 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitaly"
 # 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/git-base"
-  BASE_TAG: "13.10.3"
+  BASE_TAG: "13.11.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Gitaly"
@@ -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/gitaly.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitaly.tar.gz"
     filename: "gitaly.tar.gz"
     validation:
       type: "sha256"
-      value: "829b1d98fd90a59138a28641a52d6eb2c8df3388de69038e2da492940d3200d9"
+      value: "1c93d590a75b0311ccd45b8dbcee26203992e1b26e6674cab0a50bc5550bba40"
diff --git a/openshift.metadata b/openshift.metadata
new file mode 100644
index 0000000..e7cd51e
--- /dev/null
+++ b/openshift.metadata
@@ -0,0 +1,6 @@
+io.openshift.tags=gitlab-gitaly
+io.openshift.wants=gitlab-webservice
+io.k8s.description=GitLab Gitaly service container.
+io.openshift.non-scalable=false
+io.openshift-min-memory=200Mi
+io.openshift.min-cpu=100m
-- 
GitLab


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

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

diff --git a/Dockerfile b/Dockerfile
index 7682e04..d3ccd21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,6 @@ ARG GITALY_SERVER_VERSION=v13.11.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
-LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitaly" \
-      name="Gitaly" \
-      maintainer="GitLab Distribution Team" \
-      vendor="GitLab" \
-      version=${GITALY_SERVER_VERSION} \
-      release=${GITALY_SERVER_VERSION} \
-      summary="Gitaly is a Git RPC service for handling all the git calls made by GitLab." \
-      description="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
-
 ADD gitaly.tar.gz /
 
 COPY scripts/ /scripts/
-- 
GitLab


From 5fa09df5f469d5070c53ab7e69f7667385c3b4c1 Mon Sep 17 00:00:00 2001
From: David Freeman <davidfreeman@seed-innovations.com>
Date: Fri, 23 Apr 2021 19:46:53 +0000
Subject: [PATCH 3/3] add trufflehog config file

---
 trufflehog-config.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 trufflehog-config.yaml

diff --git a/trufflehog-config.yaml b/trufflehog-config.yaml
new file mode 100644
index 0000000..7a462a0
--- /dev/null
+++ b/trufflehog-config.yaml
@@ -0,0 +1,6 @@
+skip_strings:
+  # will only be skipped in corresponding files
+  config.toml:
+    - '# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"'
+skip_paths:
+  - trufflehog-config.yaml
-- 
GitLab