X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0a98e961b638af177b6e0aebf63f1388cb2b3498..00f65f60e69326839447f431146312481db05f01:/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 b369ff6228..c8d4a4c170 100755 --- 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 -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 -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 - -exec /usr/local/bin/arv-git-httpd +exec /usr/local/bin/arvados-git-httpd