From 031ca3f40df6918af1f155e9b3de9e9c0fb53cf5 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Wed, 10 Jun 2020 14:21:07 -0700 Subject: [PATCH] Update GitLab to the 13.0.6 Security patch --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index df24ee7..6f086f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.0.4-ubi8 +ARG GITLAB_VERSION=v13.0.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.0.4 +ARG BASE_TAG=13.0.6 ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.2 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Jenkinsfile b/Jenkinsfile index 42d250f..69f3fd6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.0.4") +dccscrPipeline(version: "13.0.6") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index d45f398..7dce7ec 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.0.4} +TAG=${1:-13.0.6} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index fe35ae8..e63b0f9 100644 --- a/download.yaml +++ b/download.yaml @@ -1,7 +1,7 @@ gitlab_version: v12.8.1-ubi8 resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.0.4-ubi8.tar" - filename: "ubi8-build-dependencies-v13.0.4-ubi8.tar" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.0.6-ubi8.tar" + filename: "ubi8-build-dependencies-v13.0.6-ubi8.tar" validation: type: "sha256" - value: "3ed3236f0191941c9b97580aa30d75d109257a6716daee5601cf26648a6eca25" + value: "f9fb8dfbf6a845c24b26a5b18c5e0c6b5b474a61f812367f89afd2913788abee" -- GitLab