archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

Use git as installation for gitaly

Browse Source 
This commit applys the patch from @fmauNeko .

Signed-off-by: solidnerd <niclas@mietz.io>
This commit is contained in:
solidnerd 2017-10-26 21:28:24 +02:00
parent e025be725e
commit 3fc8424bba
No known key found for this signature in database
GPG Key ID: C300D44AB5469BE5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/build/install.sh
View File

@ -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