projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18947: Refactor arv-git-httpd as an arvados-server subcommand.
[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 b369ff6228d0a90d9c1ef64968dde2b89d1ee7ff..c8d4a4c170d0279573d84a9248a3164d85677468 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,16
+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 install "git.arvados.org/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
+/usr/local/lib/arvbox/runsu.sh flock $ARVADOS_CONTAINER_PATH/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
+
export PATH="$PATH:$ARVADOS_CONTAINER_PATH/git/bin"
cd ~git
export PATH="$PATH:$ARVADOS_CONTAINER_PATH/git/bin"
cd ~git
-
-exec /usr/local/bin/arv-git-httpd
+exec /usr/local/bin/arvados-git-httpd