From 464cd644d6cbfd47a6a6252efd3845049f8f0426 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 22 Mar 2022 15:56:27 +0900 Subject: [PATCH] set bundler version based on gitlab's Gemfile.lock bundler used in gitlab is upgraded from 2.1.4 to 2.3.6 See more detail on : https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79251 first contained tag : v14.8.0 --- assets/build/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index a41ead05..f09b207d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -90,6 +90,10 @@ fi GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)} +# install bundler: use version specified in Gemfile.lock +BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")" +gem install bundler:"${BUNDLER_VERSION}" + # download golang echo "Downloading Go ${GOLANG_VERSION}..." wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/