From 7a0b3f7056997eca9aa394960815b09fdc80046a Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Tue, 18 Aug 2020 14:02:05 -0700 Subject: [PATCH] Update to the GitLab 13.2.6 security patch --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f15d938..4b55056 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.2.0-ubi8 +ARG GITLAB_VERSION=v13.2.6-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.2.0 +ARG BASE_TAG=13.2.6 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Jenkinsfile b/Jenkinsfile index 68393cd..36a2940 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.2.0") +dccscrPipeline(version: "13.2.6") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 16a8b7b..1fc1561 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.2.0} +TAG=${1:-13.2.6} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index c52fb05..610df95 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-shell.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "d41395c0a2f0121a7342beafc48747d0f7d83992999272521ed882b89b378932" + value: "dfb2baf80c5046520241cbfbf12e383824d84a961007062107ed14b2db6db27b" -- GitLab