diff --git a/Dockerfile b/Dockerfile index bc8207d60c0d8bbbb062acd95ee0221c680015c6..db00d047ae6a23c19fe60d85d417bcbf6b4e8f0e 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 d0a34251c8a85a021d4ba9d080c2766abcf9452c..58e7e3e1f23ed3ffa7453dcddeaa5df56b3436e7 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 e03e20b611c6285af3adadc60955078d86182e2b..88a5183d6ebc6c18e0f0cd800f76d656453811b9 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 d96ffc2864cdc19165bf59571c81216ac3b2f9d3..c639e6fb25d52e6aa252d1e46caa3c4a07c3e950 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"