diff --git a/Dockerfile b/Dockerfile index 746164bd5651373a98feec4c5f2dad0431b4890b..be6974f75cd15adc54dc4a8998742665845d39f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.5.4-ubi8 +ARG GITLAB_VERSION=v13.6.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.5.4 +ARG BASE_TAG=13.6.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Jenkinsfile b/Jenkinsfile index 11e5b2480007a3b3ad5f698bcf5be9a4c79ee825..8fe25224789c3f2a591bd673cc01bbaca6f3b886 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.5.4") +dccscrPipeline(version: "13.6.0") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index a9dd936eba70a3d50504974ac2ef30427ef9d22c..1eb99be1a0506e2dd8b1340f736912ffbf25a553 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.5.4} +TAG=${1:-13.6.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index b329d3c0e53f892d03b25c99e8f642b82b3123e8..73c6ea19ab24bf1d5c0af62be7cb121dcb854cb3 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-rails-ee.tar.gz" + - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-rails-ee.tar.gz" filename: "gitlab-rails-ee.tar.gz" validation: type: "sha256" - value: "66475e30148118d030f8e9eff9b216a57580f1e62fa9f0c340b0eb8248573dd5" + value: "72c8c470ede2fbd6de0215b5e3c0e96736a11239f8e0debe55c9bc3058206747" diff --git a/scripts/rails-dependencies b/scripts/rails-dependencies index d092e15db5067f4187ec67a382a346de6e288d4e..c0d5165da3a5814557e102a38f815789a87cf5ad 100755 --- a/scripts/rails-dependencies +++ b/scripts/rails-dependencies @@ -24,7 +24,7 @@ end [database_thread, redis_thread].map(&:join) if redis_thread.value && database_thread.value - Bundler.clean_exec ARGV.join(' ') unless ARGV.empty? + Bundler.original_exec ARGV.join(' ') unless ARGV.empty? else puts 'WARNING: Not all services were operational, with data migrations completed.'