[ARVADOS] updated: 1.3.0-1311-gfac2b536b
Git user
git at public.curoverse.com
Mon Jul 15 17:47:49 UTC 2019
Summary of changes:
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 4 +-
tools/arvbox/lib/arvbox/docker/api-setup.sh | 1 +
.../{service/controller/run => cluster-config.sh} | 13 +---
tools/arvbox/lib/arvbox/docker/createusers.sh | 2 +
.../lib/arvbox/docker/service/controller/run | 82 +---------------------
5 files changed, 8 insertions(+), 94 deletions(-)
copy tools/arvbox/lib/arvbox/docker/{service/controller/run => cluster-config.sh} (91%)
via fac2b536bf3bc340f03ba6aedf1e3c8d6a463dfd (commit)
from 7f2569f2e9900348dc76b495c9a416fe339593ae (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit fac2b536bf3bc340f03ba6aedf1e3c8d6a463dfd
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Mon Jul 15 13:46:04 2019 -0400
arvbox update go version, refactor creating cluster config.
no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index 758bcbc5f..69e09702b 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -40,7 +40,7 @@ ENV GEM_HOME /var/lib/gems
ENV GEM_PATH /var/lib/gems
ENV PATH $PATH:/var/lib/gems/bin
-ENV GOVERSION 1.11.5
+ENV GOVERSION 1.12.7
# Install golang binary
RUN curl -f http://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | \
@@ -108,7 +108,7 @@ ADD crunch-setup.sh gitolite.rc \
keep-setup.sh common.sh createusers.sh \
logger runsu.sh waitforpostgres.sh \
yml_override.py api-setup.sh \
- go-setup.sh devenv.sh \
+ go-setup.sh devenv.sh cluster-config.sh \
/usr/local/lib/arvbox/
ADD runit /etc/runit
diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index f6191d63f..d60f19627 100755
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -57,6 +57,7 @@ psql postgres -c "ALTER USER arvados WITH SUPERUSER;"
if test -a /usr/src/arvados/services/api/config/arvados_config.rb ; then
rm -f config/application.yml config/database.yml
+ flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
else
cat >config/application.yml <<EOF
$RAILS_ENV:
diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
similarity index 91%
copy from tools/arvbox/lib/arvbox/docker/service/controller/run
copy to tools/arvbox/lib/arvbox/docker/cluster-config.sh
index 4cc96e8b7..1ec279605 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -6,13 +6,8 @@
exec 2>&1
set -ex -o pipefail
-. /usr/local/lib/arvbox/common.sh
-. /usr/local/lib/arvbox/go-setup.sh
-
-(cd /usr/local/bin && ln -sf arvados-server arvados-controller)
-
-if test "$1" = "--only-deps" ; then
- exit
+if [[ -s /etc/arvados/config.yml ]] ; then
+ exit
fi
uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
@@ -31,8 +26,6 @@ else
database_env=development
fi
-mkdir -p /etc/arvados
-
cat >/var/lib/arvados/cluster_config.yml <<EOF
Clusters:
${uuid_prefix}:
@@ -96,5 +89,3 @@ 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
diff --git a/tools/arvbox/lib/arvbox/docker/createusers.sh b/tools/arvbox/lib/arvbox/docker/createusers.sh
index c6270457d..58fb41358 100755
--- a/tools/arvbox/lib/arvbox/docker/createusers.sh
+++ b/tools/arvbox/lib/arvbox/docker/createusers.sh
@@ -53,6 +53,8 @@ export R_LIBS=/var/lib/Rlibs
export GOPATH=/var/lib/gopath
EOF
+ mkdir -p /etc/arvados
+ chown -R arvbox:arvbox /etc/arvados
fi
if ! grep "^fuse:" /etc/group >/dev/null 2>/dev/null ; then
diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index 4cc96e8b7..56deed782 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -15,86 +15,6 @@ 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)
-
-workbench_secret_key_base=$(cat /var/lib/arvados/workbench_secret_token)
-
-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]}/"
- Composer:
- ExternalURL: "http://$localip:${services[composer]}"
- Controller:
- ExternalURL: "https://$localip:${services[controller-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
- Workbench:
- SecretKeyBase: $workbench_secret_key_base
- ArvadosDocsite: http://$localip:${services[doc]}/
-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
+flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-controller
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list