Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2020-10-23 10:45:25 +0300
committerStan Hu <stanhu@gmail.com>2020-10-23 10:46:10 +0300
commit64bc2213221b2ae7a18f3a00cdd8072ef5fd78ca (patch)
tree93ef044387b78da4f7270b165f8e9157a6112204 /_support
parent8be33e72f963571691cb6af0b483058f2488ae1a (diff)
Update Ruby to v2.7.2
Part of https://gitlab.com/groups/gitlab-org/-/epics/2380
Diffstat (limited to '_support')
-rw-r--r--_support/build-images/versioned/Dockerfile2
-rw-r--r--_support/instrumented-cluster/docker-compose.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/_support/build-images/versioned/Dockerfile b/_support/build-images/versioned/Dockerfile
index ca25a8dc6..d598a85eb 100644
--- a/_support/build-images/versioned/Dockerfile
+++ b/_support/build-images/versioned/Dockerfile
@@ -8,4 +8,4 @@ COPY ./Gemfile.lock /bundle-cache
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \
- cd /bundle-cache && bundle install --path vendor/bundle
+ cd /bundle-cache && gem install bundler -v 1.17.3 && bundle install --path vendor/bundle
diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml
index 114a91204..c711d3dc6 100644
--- a/_support/instrumented-cluster/docker-compose.yml
+++ b/_support/instrumented-cluster/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
services:
gitaly1repos:
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.14-git-2.27
volumes:
- gitalydata1:/repositories
- ./gitaly1repos/setup.sh:/setup.sh