diff --git a/Dockerfile b/Dockerfile index 8b7011dcc1eaf51830a6f2dcc045a54ebfcaf2c0..a13538040cbee2e57f948e122d616b76d913d9a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.5.4-ubi8 +ARG GITLAB_VERSION=v13.6.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.5.4 +ARG BASE_TAG=13.6.0 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.5.4 +ARG GITALY_SERVER_VERSION=v13.6.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index ec9c45a8ab4174a39e454db151d6794445c38d09..9d679267c1921823c939544bd3621344c6d98857 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.5.4") +dccscrPipeline(version: "13.6.0") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 1a9bd6761e5a169e035ee50dd3833cb67419c639..c3e3051cf6a30410ffe4d80949b1beeb2644e570 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.5.4} +TAG=${1:-13.6.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index fc780d3f16f39f3e5e890d6d663cf538968873e7..9505cfd4a802596718b2917b8fb1cb2679d5f036 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitaly.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "ad2c332fe8557c325949ae1035202e4e3e2cfb4be00136cfa3f3841bc4b2ed30" + value: "3402791ddb3d499c91a1d19cfda2db83b7c955c91e7e273ac895dcb20b60525c"