[ARVADOS-DEV] updated: 9d5fa0c0b0c63f4b370ca0bea8fdce1e43adab30
git at public.curoverse.com
git at public.curoverse.com
Tue Jan 12 10:07:03 EST 2016
Summary of changes:
arvbox/bin/arvbox | 13 ++++-----
arvbox/lib/arvbox/docker/Dockerfile.dev | 2 ++
arvbox/lib/arvbox/docker/service/api/run-service | 34 ++++------------------
arvbox/lib/arvbox/docker/service/sso/run-service | 21 ++-----------
.../arvbox/docker/service/workbench/run-service | 2 +-
5 files changed, 17 insertions(+), 55 deletions(-)
via 9d5fa0c0b0c63f4b370ca0bea8fdce1e43adab30 (commit)
via 7ee4a20ed997c534abe00213c511c1ebd5d134b5 (commit)
from a0d297b64c24caff3a85167fb9c179c2ae605098 (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 9d5fa0c0b0c63f4b370ca0bea8fdce1e43adab30
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jan 12 10:07:00 2016 -0500
8080: Use runsvinit for tests too.
diff --git a/arvbox/bin/arvbox b/arvbox/bin/arvbox
index 8b3aa0b..2e23a98 100755
--- a/arvbox/bin/arvbox
+++ b/arvbox/bin/arvbox
@@ -89,7 +89,7 @@ run() {
"--volume=$PASSENGER:/var/lib/passenger:rw" \
"--volume=$GEMS:/var/lib/gems:rw" \
arvados/arvbox-dev \
- /usr/local/lib/arvbox/service/postgres/run
+ /usr/local/bin/runsvinit -svdir=/etc/test-service
while ! docker exec -ti \
$ARVBOX_CONTAINER \
@@ -282,19 +282,18 @@ case "$subcmd" in
*)
echo "Arvados-in-a-box"
echo
- echo "$0 (build|start|run|open|shell|ip|stop|reboot|reset|destroy|run-tests|log|svrestart)"
+ echo "$0 (build|start|run|open|shell|ip|stop|reboot|reset|destroy|log|svrestart)"
echo
- echo "build build arvbox Docker image"
- echo "start|run start $ARVBOX_CONTAINER container "
+ echo "build <config> build arvbox Docker image"
+ echo "start|run <config> start $ARVBOX_CONTAINER container"
echo "open open arvbox workbench in a web browser"
echo "shell enter arvbox shell"
echo "ip print arvbox ip address"
echo "stop stop arvbox container"
- echo "restart stop, then run again"
- echo "reboot stop, build arvbox Docker image, run"
+ echo "restart <config> stop, then run again"
+ echo "reboot <config> stop, build arvbox Docker image, run"
echo "reset delete arvbox arvados data (be careful!)"
echo "destroy delete all arvbox code and data (be careful!)"
- echo "run-tests run run-tests.sh inside $ARVBOX_CONTAINER container"
echo "log <service> tail log of specified service"
echo "svrestart <service> restart specified service inside arvbox"
echo "clone <from> <to> clone an arvbox"
diff --git a/arvbox/lib/arvbox/docker/Dockerfile.dev b/arvbox/lib/arvbox/docker/Dockerfile.dev
index 9883d37..408e2de 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/arvbox/lib/arvbox/docker/Dockerfile.dev
@@ -9,3 +9,5 @@ RUN set -e && \
curl -L -o/tmp/$PJS.tar.bz2 https://bitbucket.org/ariya/phantomjs/downloads/$PJS.tar.bz2 && \
tar -C /usr/local -xjf /tmp/$PJS.tar.bz2 && \
ln -s ../$PJS/bin/phantomjs /usr/local/bin/
+
+RUN mkdir /etc/test-service && ln -sf /usr/local/lib/arvbox/service/postgres /etc/test-service
commit 7ee4a20ed997c534abe00213c511c1ebd5d134b5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 11 17:31:46 2016 -0500
8080: Rails projects use explicit 'development' section instead of 'common' to
avoid interfering with test configuration.
diff --git a/arvbox/lib/arvbox/docker/service/api/run-service b/arvbox/lib/arvbox/docker/service/api/run-service
index ceccb72..508c411 100755
--- a/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/arvbox/lib/arvbox/docker/service/api/run-service
@@ -38,23 +38,18 @@ test -s /var/lib/arvados/self-signed.key
sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
cat >config/application.yml <<EOF
-common:
+development:
+ uuid_prefix: $uuid_prefix
secret_token: $secret_token
+ blob_signing_key: $blob_signing_key
sso_app_secret: $sso_app_secret
sso_app_id: arvados-server
sso_provider_url: "https://$localip:${services[sso]}"
- workbench_address: "http://$localip/"
sso_insecure: true
-development:
- uuid_prefix: $uuid_prefix
- auto_admin_first_user: true
- blob_signing_key: $blob_signing_key
+ workbench_address: "http://$localip/"
git_repo_ssh_base: "git@$localip:"
git_repo_https_base: "http://$localip:${services[arv-git-httpd]}/"
-test:
- uuid_prefix: zzzzz
- git_repo_ssh_base: "git at git.zzzzz.arvadosapi.com:"
- git_repo_https_base: "http://git.zzzzz.arvadosapi.com/"
+ auto_admin_first_user: true
EOF
if ! test -f /var/lib/arvados/api_database_pw ; then
@@ -67,24 +62,7 @@ if ! (psql -c "\du" | grep "^ arvados ") >/dev/null ; then
psql -c "ALTER USER arvados CREATEDB;"
fi
-cat >config/database.yml <<EOF
-development:
- adapter: postgresql
- encoding: utf8
- database: arvados_development
- username: arvados
- password: $database_pw
- host: localhost
- template: template0
-test:
- adapter: postgresql
- encoding: utf8
- database: arvados_test
- username: arvados
- password: $database_pw
- host: localhost
- template: template0
-EOF
+sed "s/password:.*/password: $database_pw/" <config/database.yml.example >config/database.yml
if ! test -f /var/lib/arvados/api_database_setup ; then
bundle exec rake db:setup
diff --git a/arvbox/lib/arvbox/docker/service/sso/run-service b/arvbox/lib/arvbox/docker/service/sso/run-service
index d1c566a..8a96d47 100755
--- a/arvbox/lib/arvbox/docker/service/sso/run-service
+++ b/arvbox/lib/arvbox/docker/service/sso/run-service
@@ -32,7 +32,7 @@ if ! test -s /var/lib/arvados/self-signed.key ; then
fi
cat >config/application.yml <<EOF
-common:
+development:
uuid_prefix: $uuid_prefix
secret_token: $secret_token
default_link_url: "http://$localip"
@@ -49,24 +49,7 @@ if ! (psql -c "\du" | grep "^ arvados_sso ") >/dev/null ; then
psql -c "ALTER USER arvados_sso CREATEDB;"
fi
-cat >config/database.yml <<EOF
-development:
- adapter: postgresql
- encoding: utf8
- database: arvados_sso_development
- username: arvados_sso
- password: $database_pw
- host: localhost
- template: template0
-test:
- adapter: postgresql
- encoding: utf8
- database: arvados_sso_test
- username: arvados_sso
- password: $database_pw
- host: localhost
- template: template0
-EOF
+sed "s/password:.*/password: $database_pw/" <config/database.yml.example >config/database.yml
if ! test -f /var/lib/arvados/sso_database_setup ; then
bundle exec rake db:setup
diff --git a/arvbox/lib/arvbox/docker/service/workbench/run-service b/arvbox/lib/arvbox/docker/service/workbench/run-service
index a5f7195..7f0542f 100755
--- a/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -27,7 +27,7 @@ if ! test -s self-signed.key ; then
fi
cat >config/application.yml <<EOF
-common:
+development:
secret_token: $secret_token
arvados_login_base: https://$localip:${services[api]}/login
arvados_v1_base: https://$localip:${services[api]}/arvados/v1
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list