diff --git a/Dockerfile b/Dockerfile index d32593c7ccca972ff1f9f23d42fbff775b4177bd..a9b00833c7d66f2c6d0e4ae34d744cbd452a574d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -ARG GITLAB_VERSION=v12.10.3-ubi8 +ARG GITLAB_VERSION=v12.10.5-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=12.10.3 +ARG BASE_TAG=12.10.5 -ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1 +ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.2 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${UBI_IMAGE} AS builder @@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}" FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v12.10.3 +ARG GITALY_SERVER_VERSION=v12.10.5 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index bb3b5821489a834778889c9a36538d43d2cab053..6ad662e537a4f3bb704e5803a235911b499bdcfa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "12.10.3") +dccscrPipeline(version: "12.10.5") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 65b165a96e98c6af6d4c1a75c8c74b780329bda0..999759b7ba2d5c6ea2c1b9e2b128fcd14b1a2704 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-12.10.3} +TAG=${1:-12.10.5} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.json b/download.json index 7e43fe8df162449117ce03e757ce028dab25c83c..4966e1f518f1922236753848f425280084ee71f2 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-v12.10.3-ubi8.tar", - "filename": "ubi8-build-dependencies-v12.10.3-ubi8.tar", + { "url" : "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.5-ubi8.tar", + "filename": "ubi8-build-dependencies-v12.10.5-ubi8.tar", "validation": { "type": "sha256", - "value": "014daa3ea5084893124a48d6affca6b2d6cd5d50827f3027386824ae369f5767" + "value": "6b6518cf5c3641b20757d9b9c7aeb176377366a2160f283fb744d22758cd4a88" } } ] }