16306: Merge branch 'master'

[arvados.git] / tools / arvbox / lib / arvbox / docker / service / controller / run

diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index 37052e1233c70879a1b5db928cd243158249a91b..e495e222e171cd784e581bb42e5af37bb22b842f 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -9,85 +9,12 @@ set -ex -o pipefail
 . /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/cmd/arvados-server"
-install $GOPATH/bin/arvados-server /usr/local/bin
 (cd /usr/local/bin && ln -sf arvados-server arvados-controller)
 
 if test "$1" = "--only-deps" ; then
     exit
 fi
 
-uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
-secret_token=$(cat /var/lib/arvados/api_secret_token)
-blob_signing_key=$(cat /var/lib/arvados/blob_signing_key)
-management_token=$(cat /var/lib/arvados/management_token)
-sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
-vm_uuid=$(cat /var/lib/arvados/vm-uuid)
-database_pw=$(cat /var/lib/arvados/api_database_pw)
+/usr/local/lib/arvbox/runsu.sh flock $ARVADOS_CONTAINER_PATH/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
 
-if test -s /var/lib/arvados/api_rails_env ; then
-  database_env=$(cat /var/lib/arvados/api_rails_env)
-else
-  database_env=development
-fi
-
-mkdir -p /etc/arvados
-
-cat >/var/lib/arvados/cluster_config.yml <<EOF
-Clusters:
-  ${uuid_prefix}:
-    ManagementToken: $management_token
-    Services:
-      Workbench1:
-        ExternalURL: "https://$localip:${services[workbench]}"
-      Workbench2:
-        ExternalURL: "https://$localip:${services[workbench2-ssl]}"
-      SSO:
-        ExternalURL: "https://$localip:${services[sso]}"
-      Websocket:
-        ExternalURL: "wss://$localip:${services[websockets-ssl]}/websocket"
-      GitSSH:
-        ExternalURL: "ssh://git@$localip:"
-      GitHTTP:
-        ExternalURL: "http://$localip:${services[arv-git-httpd]}/"
-      WebDAV:
-        ExternalURL: "https://$localip:${services[keep-web-ssl]}/"
-    NodeProfiles:  # to be deprecated in favor of "Services" section
-      "*":
-        arvados-controller:
-          Listen: ":${services[controller]}" # choose a port
-        arvados-api-server:
-          Listen: ":${services[api]}" # must match Rails server port in your Nginx config
-    PostgreSQL:
-      ConnectionPool: 32 # max concurrent connections per arvados server daemon
-      Connection:
-        # All parameters here are passed to the PG client library in a connection string;
-        # see https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
-        Host: localhost
-        User: arvados
-        Password: ${database_pw}
-        DBName: arvados_${database_env}
-        client_encoding: utf8
-    API:
-      RailsSessionSecretToken: $secret_token
-    Collections:
-      BlobSigningKey: $blob_signing_key
-      DefaultReplication: 1
-    Containers:
-      SupportedDockerImageFormats: ["v2"]
-    Login:
-      ProviderAppSecret: $sso_app_secret
-      ProviderAppID: arvados-server
-    Users:
-      NewUsersAreActive: true
-      AutoAdminFirstUser: true
-      AutoSetupNewUsers: true
-      AutoSetupNewUsersWithVmUUID: $vm_uuid
-      AutoSetupNewUsersWithRepository: true
-EOF
-
-/usr/local/lib/arvbox/yml_override.py /var/lib/arvados/cluster_config.yml
-
-cp /var/lib/arvados/cluster_config.yml /etc/arvados/config.yml
-
-exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-controller
+exec /usr/local/bin/arvados-controller