From 14614d15a69b0e7f411511dd4266b829ce2ccbbf Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 3 Jul 2020 15:58:26 -0700 Subject: [PATCH] Update GitLab to the 13.1.2 Security Release --- 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 a9237f7..e648177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.1.1-ubi8 +ARG GITLAB_VERSION=v13.1.2-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.1.1 +ARG BASE_TAG=13.1.2 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.1.1 +ARG GITALY_SERVER_VERSION=v13.1.2 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index d09308c..7f930b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.1.1") +dccscrPipeline(version: "13.1.2") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index e9ec0a7..8959092 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.2} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.json b/download.json index 3697611..a58243f 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.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.2-ubi8.tar", + "filename": "ubi8-build-dependencies-v13.1.2-ubi8.tar", "validation": { "type": "sha256", - "value": "3f53617949bb8c50b5bb3bb728b0e2b7d849220b0406722bd781c2cb97325f1d" + "value": "0d31edd9202d77105c17ebf662995295d335e8ede3f306fea48e022fc57dc994" } } ] } -- GitLab