UNCLASSIFIED

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

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

Update Gitlab to 13.8.4 Security Release

See merge request !59
parents 26371de6 2afe00e5
Pipeline #168917 passed with stages
in 29 minutes and 38 seconds
ARG GITLAB_VERSION=v13.8.2-ubi8
ARG GITLAB_VERSION=v13.8.4-ubi8
ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
ARG BASE_TAG=13.8.2
ARG BASE_TAG=13.8.4
ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
......@@ -4,7 +4,7 @@
set -euxo pipefail
TAG=${1:-13.8.2}
TAG=${1:-13.8.4}
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.8.2"
- "13.8.4"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
BASE_TAG: "13.8.2"
BASE_TAG: "13.8.4"
# 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.8.2"
org.opencontainers.image.version: "13.8.4"
## 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.8.2-ubi8/gitlab-task-runner-ee.tar.gz"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-task-runner-ee.tar.gz"
filename: "gitlab-task-runner-ee.tar.gz"
validation:
type: "sha256"
value: "86ccd6cbc7580b761d58053621096cd0f6cf9e70d0e68f5ba105184aba7bd212"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.2-ubi8/gitlab-python.tar.gz"
value: "1d4b6b80b19e1950a76e7cb4cfbe3f0246b769942d2e2cb1ff50edfbcdc9d994"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.4-ubi8/gitlab-python.tar.gz"
filename: "gitlab-python.tar.gz"
validation:
type: "sha256"
value: "9dbafedfec8e6ae808661b8fa05b2c31378de35229f0978c391e2fecefced50a"
value: "21dd1d25434e6bb93781bf3db32d69f9a19f3b46152b300b392c33211b965b25"
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