From e6f89516541d2001ada72aa77576413ad957ac15 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Wed, 27 May 2020 14:57:30 -0700 Subject: [PATCH] Update GitLab to the 13.0.1 security patch --- Dockerfile | 6 +++--- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.json | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2333d6..bf41cf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.0.0-ubi8 +ARG GITLAB_VERSION=v13.0.1-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.0.0 +ARG BASE_TAG=13.0.1 ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.2 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}" FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.0.0 +ARG GITALY_SERVER_VERSION=v13.0.1 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index e538fc4..098e938 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.0.0") +dccscrPipeline(version: "13.0.1") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 52e1693..f540430 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.0.0} +TAG=${1:-13.0.1} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.json b/download.json index 42cd375..a8d298d 100644 --- a/download.json +++ b/download.json @@ -1,10 +1,10 @@ { "resources": [ - { "url" : "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.0.0-ubi8.tar", - "filename": "ubi8-build-dependencies-v13.0.0-ubi8.tar", + { "url" : "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v13.0.1-ubi8.tar", + "filename": "ubi8-build-dependencies-v13.0.1-ubi8.tar", "validation": { "type": "sha256", - "value": "cc1b4a19399730a1cb8b17adb9fd8f7014c993736d4e77028d8a1c625a16f07a" + "value": "a5f1d5c2bf5ab67777976facf7277bf9717fc8206a993159a588ce1b0eaa4159" } } ] } -- GitLab