From 46f9cb15d6d99e408e7c764fae61d8a7379d9906 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 d885abf..de2c60b 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 2a34e7b..7bf91d3 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 1406043..eec6fa5 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-mailroom.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-mailroom.tar.gz" filename: "gitlab-mailroom.tar.gz" validation: type: "sha256" - value: "4c8082597a807551793155a4cc1b51cef43f52e4397c1bb4f790790ad9d3c503" + value: "573056ed08a78e9739712b39c690397c8ae9f2b571aa07fb017f29dafc3beaaf" -- GitLab