UNCLASSIFIED

Commit b307a440 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'release-gitlab-14-0-5' into 'development'

Update GitLab to the 14.0.5 Release

See merge request !82
parents 680b46b3 2bad7231
Pipeline #368712 passed with stages
in 25 minutes and 38 seconds
ARG GITLAB_VERSION=v14.0.2-ubi8
ARG GITLAB_VERSION=v14.0.5-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.2
ARG BASE_TAG=14.0.5
ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
......@@ -4,7 +4,7 @@
set -euxo pipefail
TAG=${1:-14.0.2}
TAG=${1:-14.0.5}
REPOSITORY=${2:-}
DOCKER_OPTS=${DOCKER_OPTS:-""}
......
......@@ -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.2"
- "14.0.5"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
BASE_TAG: "14.0.2"
BASE_TAG: "14.0.5"
# 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.2"
org.opencontainers.image.version: "14.0.5"
## 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-v14.0.2-ubi8/gitlab-task-runner-ee.tar.gz"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-task-runner-ee.tar.gz"
filename: "gitlab-task-runner-ee.tar.gz"
validation:
type: "sha256"
value: "68a52f1fddd694cab2fcbc9179b44e75409336d38407cf4cc0e2ee88320d22ed"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.2-ubi8/gitlab-python.tar.gz"
value: "0e7b46a6840c80a66dda9548bb192d2f916385f480ec761e1e3a0f01a29da9e0"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-python.tar.gz"
filename: "gitlab-python.tar.gz"
validation:
type: "sha256"
value: "4db71b90cfb74ebe25ea502abac9af917fe4bf8e34e0e2808a6f717e28ecdd2d"
value: "888cc1160f8d04084b6f685d213cfc0cfd58cd3f2c8ec7ad0395e6dfc421d346"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment