From 0a8a73bf3a348a1ce71ca669aaa052c730a149c8 Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 14 Apr 2021 14:38:48 +0000
Subject: [PATCH 1/2] Update GitLab to the 13.10.3 Security Release

---
 Dockerfile              | 13 +++++++++++--
 build-scripts/build.sh  |  2 +-
 hardening_manifest.yaml | 14 +++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f21e7f6..5b3f4c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.10.0-ubi8
+ARG GITLAB_VERSION=v13.10.3-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.0
+ARG BASE_TAG=13.10.3
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -12,6 +12,15 @@ ARG GITLAB_SHELL_VERSION=v13.17.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
+LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-shell" \
+      name="GitLab Shell" \
+      maintainer="GitLab Distribution Team" \
+      vendor="GitLab" \
+      version=${GITLAB_SHELL_VERSION} \
+      release=${GITLAB_SHELL_VERSION} \
+      summary="SSH access and repository management app for GitLab." \
+      description="SSH access and repository management app for GitLab."
+
 ADD gitlab-shell.tar.gz /
 ADD gitlab-logger.tar.gz /usr/local/bin
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index d654a95..f478c16 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.10.0}
+TAG=${1:-13.10.3}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index e3270c8..e98f7a9 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "13.10.0"
+  - "13.10.3"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "13.10.0"
+  BASE_TAG: "13.10.3"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Shell"
@@ -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.0"
+  org.opencontainers.image.version: "13.10.3"
   ## 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,13 +43,13 @@ maintainers:
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "f7548a0d4f200ec2a0ff28da25786b74e73a4205a4ffb2e405f251396ad79fcc"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-logger.tar.gz"
+      value: "89d9d47445f0a2e62363e11df549802a02c0cf7d84cc559df31ad9910694c01d"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "3b62c41e020fff9f4178da60872a61ced111e2955d3a862515293b509267ef81"
+      value: "c1fdd021b52c724c6c44e94e5de1266241b8f7e1cdeeb194e62547ae1b43a8d4"
-- 
GitLab


From 5f13b5faec2380d91e514d7baf9311584536714f Mon Sep 17 00:00:00 2001
From: Steven Terhar <sterhar@gitlab.com>
Date: Wed, 14 Apr 2021 14:51:32 +0000
Subject: [PATCH 2/2] Update Dockerfile - remove label

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

diff --git a/Dockerfile b/Dockerfile
index 5b3f4c5..f66188d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,6 @@ ARG GITLAB_SHELL_VERSION=v13.17.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
-LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-shell" \
-      name="GitLab Shell" \
-      maintainer="GitLab Distribution Team" \
-      vendor="GitLab" \
-      version=${GITLAB_SHELL_VERSION} \
-      release=${GITLAB_SHELL_VERSION} \
-      summary="SSH access and repository management app for GitLab." \
-      description="SSH access and repository management app for GitLab."
-
 ADD gitlab-shell.tar.gz /
 ADD gitlab-logger.tar.gz /usr/local/bin
 
-- 
GitLab