From d0cb33ad5182df8cbec63434bec84cda885e190f 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 | 6 +++--- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index deb185f..0bb8dd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -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-rails -ARG BASE_TAG=13.6.3 +ARG BASE_TAG=13.7.0 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -12,7 +12,7 @@ ARG GITLAB_VERSION ARG GITLAB_USER=git ARG DNF_OPTS -LABEL source="https://github.com/mperham/sidekiq" \ +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-sidekiq" \ name="GitLab Sidekiq" \ 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 372dc37..a927729 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 fc75326..dfd025f 100644 --- a/download.yaml +++ b/download.yaml @@ -1,11 +1,11 @@ resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "7a1bea79af577bef6b8e68c50430daa7a973e01976cc6b974e76b69625ca8e3b" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-python.tar.gz" + value: "bb50f58e5cee5727500b10f1598e9df72942d60b792cda3a9c15d145d63eee90" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "6fae28841db8c515045f85dfc74291f1d57fb9569ee63fe583ad2eabbdb70231" + value: "bda413f64821282b5fb9956b997a4d0200db73fe5201a7d3b1e72620a5f61c91" -- GitLab