Merge branch 'development' into 'master'

Development

See merge request !86

Dockerfile

-ARG GITLAB_VERSION=v14.0.5-ubi8
+ARG GITLAB_VERSION=v14.1.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
-ARG BASE_TAG=14.0.5
+ARG BASE_TAG=14.1.0
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 

build-scripts/build.sh

@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.0.5}
+TAG=${1:-14.1.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 

hardening_manifest.yaml

@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-task-runner"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.0.5"
+  - "14.1.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "14.0.5"
+  BASE_TAG: "14.1.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Task Runner"
@@ -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: "14.0.5"
+  org.opencontainers.image.version: "14.1.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"
@@ -42,14 +42,18 @@ maintainers:
   - name: "Al Fontaine"
     username: "alfontaine"
     email: "alan.fontaine@centauricorp.com"
+  - email: "adam.martin@rancherfederal.com"
+    name: "Adam Martin"
+    username: "adam.martin"
+    cht_member: true
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-task-runner-ee.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-task-runner-ee.tar.gz"
     filename: "gitlab-task-runner-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "0e7b46a6840c80a66dda9548bb192d2f916385f480ec761e1e3a0f01a29da9e0"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-python.tar.gz"
+      value: "4946a436961f8ee1f6156284435eaf77f841e12a00f0d72d201dc60d4ab0d251"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "888cc1160f8d04084b6f685d213cfc0cfd58cd3f2c8ec7ad0395e6dfc421d346"
+      value: "922693097821abcad87bad68b8951b44f4ac592fc77d283cad6f7a6839c9165e"