From 96e0137b438722ab41f26796302d9b420ff4163f Mon Sep 17 00:00:00 2001 From: Steven Terhar Date: Tue, 15 Sep 2020 20:20:12 +0000 Subject: [PATCH] Update GitLab to 13.3.6 patch 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 f15d938..378cf36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.2.0-ubi8 +ARG GITLAB_VERSION=v13.3.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.3.6 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_SHELL_VERSION=v13.3.0 +ARG GITLAB_SHELL_VERSION=v13.6.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index 68393cd..a1ee26d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.2.0") +dccscrPipeline(version: "13.3.6") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 16a8b7b..e2f2238 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.3.6} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index c52fb05..f7e64f8 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.3.6-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "d41395c0a2f0121a7342beafc48747d0f7d83992999272521ed882b89b378932" + value: "ba8652c26dbc2d326199755b15a7bc05dc8e54e62fe72623455fdfa07fb23225" -- GitLab