UNCLASSIFIED

Commit 26371de6 authored by Al Fontaine's avatar Al Fontaine
Browse files

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

Update GitLab to the 13.8.2 Security Release

See merge request !58
parents 6dc99c89 88e1f614
Pipeline #152247 passed with stages
in 30 minutes and 45 seconds
ARG GITLAB_VERSION=v13.8.0-ubi8 ARG GITLAB_VERSION=v13.8.2-ubi8
ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
ARG BASE_TAG=13.8.0 ARG BASE_TAG=13.8.2
ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
set -euxo pipefail set -euxo pipefail
TAG=${1:-13.8.0} TAG=${1:-13.8.2}
REPOSITORY=${2:-} REPOSITORY=${2:-}
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}
......
...@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-task-runner" ...@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-task-runner"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "13.8.0" - "13.8.2"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
BASE_IMAGE: "gitlab/gitlab/gitlab-rails" BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
BASE_TAG: "13.8.0" BASE_TAG: "13.8.2"
# Docker image labels # Docker image labels
labels: labels:
org.opencontainers.image.title: "Gitlab Task Runner" org.opencontainers.image.title: "Gitlab Task Runner"
...@@ -22,7 +22,7 @@ labels: ...@@ -22,7 +22,7 @@ labels:
org.opencontainers.image.url: "https://about.gitlab.com/" org.opencontainers.image.url: "https://about.gitlab.com/"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Gitlab" org.opencontainers.image.vendor: "Gitlab"
org.opencontainers.image.version: "13.8.0" org.opencontainers.image.version: "13.8.2"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "gitlab, git, gitops" mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -43,13 +43,13 @@ maintainers: ...@@ -43,13 +43,13 @@ maintainers:
username: "alfontaine" username: "alfontaine"
email: "alan.fontaine@centauricorp.com" email: "alan.fontaine@centauricorp.com"
resources: resources:
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-task-runner-ee.tar.gz" - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-task-runner-ee.tar.gz"
filename: "gitlab-task-runner-ee.tar.gz" filename: "gitlab-task-runner-ee.tar.gz"
validation: validation:
type: "sha256" type: "sha256"
value: "206287f4b875209a1ae06d19c26c11dd08141bd1e8672cdce039ff0d56a2ae41" value: "86ccd6cbc7580b761d58053621096cd0f6cf9e70d0e68f5ba105184aba7bd212"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/gitlab-python.tar.gz" - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-python.tar.gz"
filename: "gitlab-python.tar.gz" filename: "gitlab-python.tar.gz"
validation: validation:
type: "sha256" type: "sha256"
value: "5a526905739dcc1a1afafe7c9de4367d2dd307f0c9104ad26e6faa5a66e86b35" value: "9dbafedfec8e6ae808661b8fa05b2c31378de35229f0978c391e2fecefced50a"
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