From 3fc8424bbae24b0befdb74f4b70fa9b313f6eab8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 26 Oct 2017 21:28:24 +0200 Subject: [PATCH] Use git as installation for gitaly This commit applys the patch from @fmauNeko . Signed-off-by: solidnerd --- assets/build/install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index b5fb3d42..1591447d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -5,7 +5,7 @@ GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git -GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz +GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" @@ -115,17 +115,16 @@ cp -f gitlab-pages /usr/local/bin/ # download gitaly echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..." -mkdir -p ${GITLAB_GITALY_INSTALL_DIR} -wget -cq ${GITLAB_GITALY_URL}?ref=v${GITALY_SERVER_VERSION} -O ${GITLAB_BUILD_DIR}/gitaly-${GITALY_SERVER_VERSION}.tar.gz -tar xf ${GITLAB_BUILD_DIR}/gitaly-${GITALY_SERVER_VERSION}.tar.gz --strip 1 -C ${GITLAB_GITALY_INSTALL_DIR} -rm -rf ${GITLAB_BUILD_DIR}/gitaly-${GITALY_SERVER_VERSION}.tar.gz +exec_as_git git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_INSTALL_DIR} chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} # copy default config for gitaly exec_as_git cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml # install gitaly cd ${GITLAB_GITALY_INSTALL_DIR} -PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make install && make clean +ln -sf /tmp/go /usr/local/go +PATH=/tmp/go/bin:$PATH make install && make clean +rm -f /usr/local/go # remove go rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz /tmp/go