UNCLASSIFIED

Verified Commit e53202b4 authored by Steven Terhar's avatar Steven Terhar
Browse files

Update GitLab to the 13.10.1 Security Release

parent a9832cf6
Pipeline #207935 failed with stages
in 27 seconds
ARG GITLAB_VERSION=v13.10.0-ubi8
ARG GITLAB_VERSION=v13.10.1-ubi8
ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
ARG BASE_TAG=13.10.0
ARG BASE_TAG=13.10.1
ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......@@ -12,6 +12,15 @@ ARG GITLAB_VERSION
ARG GITLAB_USER=git
ARG DNF_OPTS
LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-task-runner" \
name="GitLab Task Runner" \
maintainer="GitLab Distribution Team" \
vendor="GitLab" \
version=${GITLAB_VERSION} \
release=${GITLAB_VERSION} \
summary="Task Runner is an entry point for interaction with other containers in the cluster." \
description="Task Runner is an entry point for interaction with other containers in the cluster. It contains scripts for running Rake tasks, backup, restore, and tools to intract with object storage."
ADD gitlab-task-runner-ee.tar.gz /
ADD gitlab-python.tar.gz /
......
......@@ -4,7 +4,7 @@
set -euxo pipefail
TAG=${1:-13.10.0}
TAG=${1:-13.10.1}
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.10.0"
- "13.10.1"
- "latest"
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
BASE_TAG: "13.10.0"
BASE_TAG: "13.10.1"
# 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.10.0"
org.opencontainers.image.version: "13.10.1"
## 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.10.0-ubi8/gitlab-task-runner-ee.tar.gz"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-task-runner-ee.tar.gz"
filename: "gitlab-task-runner-ee.tar.gz"
validation:
type: "sha256"
value: "7324b972fa0c7a47dd6647ee161ded8cb6d8d9872a84244447eb9421306a7acd"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-python.tar.gz"
value: "7056f75e348421225f5a92619324c61483cb02c92ecd617175b067468b3f57b3"
- url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.1-ubi8/gitlab-python.tar.gz"
filename: "gitlab-python.tar.gz"
validation:
type: "sha256"
value: "3e24e604dc632bd8ce5af666dfb2ff0b82615cc43a213cfd70d8b47700121ff9"
value: "6d33ee36e26164593cb3b0236782bf5b50140530d77e1c0ca43d641da1c9a01b"
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