diff --git a/Dockerfile b/Dockerfile index f15d938e623ec3ead420e03551caf4388aef2b8c..57f77434ba1728a2f5dcd3cb455e1231a5d71ebc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.2.0-ubi8 +ARG GITLAB_VERSION=v13.3.4-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.2.0 +ARG BASE_TAG=13.3.4 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_SHELL_VERSION=v13.3.0 +ARG GITLAB_SHELL_VERSION=v13.6.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index 68393cd098a081c8923daddab16ee951bb6f5474..94380c8d7b088bb67cfb7b078b1b6c21db3ce9d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.2.0") +dccscrPipeline(version: "13.3.4") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 16a8b7bb83d22a0b7a3671074aa1b9206f370cae..a7228825bebb5e26009f500278b7d6c8f377e93d 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.3.4} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index c52fb05f19d2afbe679c212377fce610930169c4..af7527f5e1688d92332fe594b2758b144bc2be56 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-shell.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.3.4-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "d41395c0a2f0121a7342beafc48747d0f7d83992999272521ed882b89b378932" + value: "1ff7e48616901b79d18e5d34bda12b4a297cf76683c9e20f5a77d8911a224168"