From 1c9ca5fb31de6dd7b71924b11b9695afa8625e1c Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Tue, 22 Dec 2020 07:39:26 -0800 Subject: [PATCH] Upgrade GitLab to the 13.7.0 Feature Release --- Dockerfile | 8 ++++---- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc8207d..db00d04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ -ARG GITLAB_VERSION=v13.6.3-ubi8 +ARG GITLAB_VERSION=v13.7.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.6.3 +ARG BASE_TAG=13.7.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_SHELL_VERSION=v13.13.0 +ARG GITLAB_SHELL_VERSION=v13.14.0 ARG GITLAB_USER=git ARG DNF_OPTS -LABEL source="https://gitlab.com/gitlab-org/gitlab-shell" \ +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-shell" \ name="GitLab Shell" \ maintainer="GitLab Distribution Team" \ vendor="GitLab" \ diff --git a/Jenkinsfile b/Jenkinsfile index d0a3425..58e7e3e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.6.3") +dccscrPipeline(version: "13.7.0") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index e03e20b..88a5183 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.6.3} +TAG=${1:-13.7.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index d96ffc2..c639e6f 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "3a37419871f20da6b9a4eae4f01cb16a54e87bcd13ed6c59f15718f05f0bed9b" + value: "01186054e00c948a268d32ae6a81da7a327fe21965fd0d66e1c7640ca18f4531" -- GitLab