projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21204: Merge branch '21204-stable-log-sort' from arvados-workbench2.git
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
service
/
arv-git-httpd
/
run-service
diff --git
a/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
b/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
index 9339f2328c6a9ee8a5e3058e537cb212ddbd0c00..b598a75d895ef7c064411eee94a12372359d1e29 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
+++ b/
tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service
@@
-9,20
+9,14
@@
set -ex -o pipefail
. /usr/local/lib/arvbox/common.sh
. /usr/local/lib/arvbox/go-setup.sh
. /usr/local/lib/arvbox/common.sh
. /usr/local/lib/arvbox/go-setup.sh
-flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/arv-git-httpd"
-install $GOPATH/bin/arv-git-httpd /usr/local/bin
+(cd /usr/local/bin && ln -sf arvados-server arvados-git-httpd)
if test "$1" = "--only-deps" ; then
exit
fi
if test "$1" = "--only-deps" ; then
exit
fi
-export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
-export ARVADOS_API_HOST_INSECURE=1
-export PATH="$PATH:/var/lib/arvados/git/bin"
-cd ~git
+flock $ARVADOS_CONTAINER_PATH/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
-exec /usr/local/bin/arv-git-httpd \
- -address=:${services[arv-git-httpd]} \
- -git-command=/usr/share/gitolite3/gitolite-shell \
- -gitolite-home=/var/lib/arvados/git \
- -repo-root=/var/lib/arvados/git/repositories
+export PATH="$PATH:$ARVADOS_CONTAINER_PATH/git/bin"
+cd ~git
+exec /usr/local/bin/arvados-git-httpd