From b40c97de0f32b840f2ba43b76ad76eed9f835ea8 Mon Sep 17 00:00:00 2001 From: Steven Terhar Date: Mon, 2 Nov 2020 20:58:15 +0000 Subject: [PATCH] Update GitLab to 13.5.2 Security Release --- Dockerfile | 6 +++--- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 73dda06..dd5b83b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.5.0-ubi8 +ARG GITLAB_VERSION=v13.5.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.5.0 +ARG BASE_TAG=13.5.2 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_SHELL_VERSION=v13.10.0 +ARG GITLAB_SHELL_VERSION=v13.11.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index d14f660..13718de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.5.0") +dccscrPipeline(version: "13.5.2") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 33c18d3..0bd760b 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.5.0} +TAG=${1:-13.5.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index 5671c7c..85dc4db 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.0-ubi8/gitlab-shell.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.2-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "35b94b33dea8e10b12e10bb0b8627b54024c812ee24eec32bdcde549f3c37a22" + value: "b5bb859cc32b4cf063ec8bfc9e8300eea5938e47e3ddae09be18df98921b375f" -- GitLab