UNCLASSIFIED

Commit 04ff40a4 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'release-gitlab-13-12-2' into 'development'

Update GitLab to the 13.12.2 Security Release

See merge request !77
parents 66ec109b 70508d85
Pipeline #332176 failed with stages
in 3 minutes and 33 seconds
ARG GITLAB_VERSION=v13.12.0-ubi8
ARG GITLAB_VERSION=v13.12.2-ubi8
ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
ARG BASE_TAG=13.12.0
ARG BASE_TAG=13.12.2
ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
......@@ -4,7 +4,7 @@
set -euxo pipefail
TAG=${1:-13.12.0}
TAG=${1:-13.12.2}
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:
- "13.12.0"
- "13.12.2"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
BASE_TAG: "13.12.0"
BASE_TAG: "13.12.2"
# 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: "13.12.0"
org.opencontainers.image.version: "13.12.2"
## 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.12.0-ubi8/gitlab-task-runner-ee.tar.gz"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-task-runner-ee.tar.gz"
filename: "gitlab-task-runner-ee.tar.gz"
validation:
type: "sha256"
value: "13bd77fe4a0077119138c7e7ddf0cbbf7d247b87c503f289f6140e1f413b524c"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.0-ubi8/gitlab-python.tar.gz"
value: "fcc8fde5e263dc8d53cbd5fbd09db0b01e2ec6b1174730d5cde2f689e620a2f6"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.12.2-ubi8/gitlab-python.tar.gz"
filename: "gitlab-python.tar.gz"
validation:
type: "sha256"
value: "1326de3e530204bf98181de17d197ddb47aa4c429a4da9c318dfff9180df34ed"
value: "504cc701f686141196608dbd60aa23150d1e8c1b14564e6bcd6b5bdbb1ece21d"
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