From 965af303a470a37ce11771e112cdf5059f9b6af9 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 | 4 ++-- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8372bbb..b3adb62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -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-rails -ARG BASE_TAG=13.5.0 +ARG BASE_TAG=13.5.2 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} 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 50cd076..a35aded 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 d9cf818..5b5504b 100644 --- a/download.yaml +++ b/download.yaml @@ -1,11 +1,11 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.0-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.2-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "9b55a33e577d94e2a71b4bd4dd7a5f16ea1f934c478918f79239074c39ae22f8" - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.0-ubi8/gitlab-python.tar.gz" + value: "f52f1c70cba0bcaa322bf61c2cb921bb1f07f5e4d85e0b9fda05a8a16a365222" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.2-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "bca8d0bbdbce159fdc386d9dfe8c60428804d368831886575b57362ee0cc6f75" + value: "41afc62004fc7d721e25d8b339744da1652eee3de8f1da412dcc216d6196bfb9" -- GitLab