From c35ef171987bdc89cc457dad7cdaec46e2b61bb0 Mon Sep 17 00:00:00 2001 From: Steven Terhar Date: Tue, 7 Jul 2020 15:35:09 +0000 Subject: [PATCH 1/2] Update GitLab to the 13.1.3 Security Release --- 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 e56001e..f1fd3e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.1.1-ubi8 +ARG GITLAB_VERSION=v13.1.3-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.1.1 +ARG BASE_TAG=13.1.3 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 1a0b4cb..08a04e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.1-development") +dccscrPipeline(version: "13.1.3") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 7243225..03005dc 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.1.1} +TAG=${1:-13.1.3} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index 387b85c..02bb19d 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.1.1-ubi8.tar" - filename: "ubi8-build-dependencies-v13.1.1-ubi8.tar" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.1.3-ubi8.tar" + filename: "ubi8-build-dependencies-v13.1.3-ubi8.tar" validation: type: "sha256" - value: "3f53617949bb8c50b5bb3bb728b0e2b7d849220b0406722bd781c2cb97325f1d" + value: "073b5f9677cb1493955f7ecd122b0ecf9f49d72e1bd082b1f5affdc95fe9e4b5" -- GitLab From 007b5b4acf74816fd2f403d23cf53c85c82ca630 Mon Sep 17 00:00:00 2001 From: alfontaine Date: Mon, 20 Jul 2020 14:21:41 -0600 Subject: [PATCH 2/2] gitlab update script --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08a04e7..96a692b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.3") +dccscrPipeline(version: "13.1.3-development") -- GitLab