diff --git a/Dockerfile b/Dockerfile index 86d83407d94d716bd99a8de2ce2537247381ca5b..8fabe87bbcf5310b49ff0a4eb3721a5e67a9958e 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/git-base -ARG BASE_TAG=13.6.3 +ARG BASE_TAG=13.7.0 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.6.3 +ARG GITALY_SERVER_VERSION=v13.7.0 ARG GITLAB_USER=git ARG DNF_OPTS -LABEL source="https://gitlab.com/gitlab-org/gitaly" \ +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitaly" \ name="Gitaly" \ maintainer="GitLab Distribution Team" \ vendor="GitLab" \ diff --git a/Jenkinsfile b/Jenkinsfile index bd962abb1ab2c8349fb0e1809e1fe6a847d470b2..34eb2076984e1ca84cf99ac22a971ceca2b88fe3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @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 2c9cc6ad14cb7035a082d7d82af194b12a2b8811..851e6d5686c8f5e5413b5768dea98085c0cf3e84 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 4a8fd30b9de4bc19e5bc848bef4e59100c70e888..aecd4014167d9bebebc3c83c6e0bbebe0883cb60 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "ec47302936c51851a5dd4b5bd30d96bb792900e4ab6691f0ef6bed761b07fe96" + value: "6c9e6fa02652636d80344c7eab4a2f01deb057c8c5709f03a1cc8d96c5c272fa"