diff --git a/Dockerfile b/Dockerfile index 5796f5c7a73c36626829b6e164350c50868710f9..bc54903940dbf974288e0887d2e5dd17726ea53e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.2.0-ubi8 +ARG GITLAB_VERSION=v13.2.6-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.2.0 +ARG BASE_TAG=13.2.6 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.2.0 +ARG GITALY_SERVER_VERSION=v13.2.6 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index 06ba1fffc26630a97859ca4986e4dc8c72ebb1ac..14dd1f82820db967939ab0ce5d1ddad86ff5d137 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.2.0") +dccscrPipeline(version: "13.2.6") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index ba473c67c5fa211da68eb13224c6ac1fed94e334..02dd4156cef99dc24a70213d7567447ddae57220 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.2.6} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index c1ea847808290e70cfe37b413f741f57d1f0bba4..00354facc77215f169044635d7c6a9e052fda3cd 100644 --- a/download.yaml +++ b/download.yaml @@ -1,11 +1,11 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitaly.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "f9bbe8957efb4e7624b428289072db0636b85c663c2c856328f5e320b09fff78" - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-shell.tar.gz" + value: "82a7c83549fa5070b1b01e52871dc9f5d75abd42b1023850f3f27922aa455c4d" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.6-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "d41395c0a2f0121a7342beafc48747d0f7d83992999272521ed882b89b378932" + value: "dfb2baf80c5046520241cbfbf12e383824d84a961007062107ed14b2db6db27b"