Skip to content

Commit 230284e

Browse files
committed
Do not copy ruby by installing gitaly
1 parent 88148ec commit 230284e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

assets/build/install.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,12 @@ git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLA
146146
# install gitaly
147147
make -C ${GITLAB_GITALY_BUILD_DIR} install
148148
mkdir -p ${GITLAB_GITALY_INSTALL_DIR}
149-
cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/
149+
# The following line causes some issues. However, according to
150+
# <https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5512> and
151+
# <https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5671> there seems to
152+
# be some attempts to remove ruby from gitaly.
153+
#
154+
# cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/
150155
cp -a ${GITLAB_GITALY_BUILD_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml
151156
rm -rf ${GITLAB_GITALY_INSTALL_DIR}/ruby/vendor/bundle/ruby/**/cache
152157
chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR}

0 commit comments

Comments
 (0)