[ARVADOS-DEV] updated: 7ea25909b52c699602bbb9d0b289822d6a667b0a
git at public.curoverse.com
git at public.curoverse.com
Mon Jan 18 17:17:22 EST 2016
Summary of changes:
arvbox/{README => README.md} | 78 ++++++++++++++++++++++----------
arvbox/bin/arvbox | 2 +-
arvbox/lib/arvbox/docker/Dockerfile.base | 2 +
3 files changed, 58 insertions(+), 24 deletions(-)
rename arvbox/{README => README.md} (50%)
via 7ea25909b52c699602bbb9d0b289822d6a667b0a (commit)
via c21c9678daeb04be1b84e96414a24eef2c94bc49 (commit)
via 1c2e1cef416d8cb0215cb3bc9451d82e8f08f25d (commit)
via 98cf9d2823a2428d5d3d4eb00b3e07e7c3528121 (commit)
via 2ea94dd246e2124720f810c6dad6a25d941ebd62 (commit)
from 02c3150928209dfd5adcd107760637a4256fb902 (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 7ea25909b52c699602bbb9d0b289822d6a667b0a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 18 17:17:19 2016 -0500
8080: Scrub default postgres database, demo config finally works!
diff --git a/arvbox/lib/arvbox/docker/Dockerfile.base b/arvbox/lib/arvbox/docker/Dockerfile.base
index 23fca74..cdbface 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -14,6 +14,8 @@ RUN apt-get update && \
RUN curl -sSL https://get.docker.com/ | sh
VOLUME /var/lib/docker
+RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql
+
RUN cd /root && \
GOPATH=$PWD go get github.com/curoverse/runsvinit && \
install bin/runsvinit /usr/local/bin
diff --git a/arvbox/lib/arvbox/docker/Dockerfile.demo b/arvbox/lib/arvbox/docker/Dockerfile.demo
index d40cd5c..1085abc 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -5,7 +5,6 @@ RUN cd /usr/src && \
git clone https://github.com/curoverse/sso-devise-omniauth-provider.git sso
RUN chown -R 1000:1000 /usr/src && /usr/local/lib/arvbox/createusers.sh
-RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql
RUN sudo -u arvbox /usr/local/lib/arvbox/service/sso/run-service --only-deps
RUN sudo -u arvbox /usr/local/lib/arvbox/service/api/run-service --only-deps
commit c21c9678daeb04be1b84e96414a24eef2c94bc49
Merge: 1c2e1ce 02c3150
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 18 17:00:36 2016 -0500
Merge branch '8080-arvbox' of git.curoverse.com:arvados-dev into 8080-arvbox
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
commit 1c2e1cef416d8cb0215cb3bc9451d82e8f08f25d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 18 17:00:27 2016 -0500
8080: Working on demo mode.
diff --git a/arvbox/README.md b/arvbox/README.md
index 3537119..b924b2d 100644
--- a/arvbox/README.md
+++ b/arvbox/README.md
@@ -4,7 +4,7 @@ Self-contained development, demonstration and testing environment for Arvados.
## Quick start
-$ ./bin/arvbox reboot localdemo
+$ bin/arvbox reboot dev
## Usage
@@ -31,18 +31,18 @@ clone <from> <to> clone an arvbox
### dev
Development configuration. Boots a complete Arvados environment inside the
-container. The "arvados", "arvado-dev" and "sso" code directories along data
-directories "postresql", "var", "passenger" and "gems" are bind mounted from
-the host file system for easy access and persistence across container rebuilds.
-Services are bound to the Docker container's network IP address and can only be
-access on the local host.
+container. The "arvados", "arvado-dev" and "sso-devise-omniauth-provider" code
+directories along data directories "postgres", "var", "passenger" and "gems"
+are bind mounted from the host file system for easy access and persistence
+across container rebuilds. Services are bound to the Docker container's
+network IP address and can only be accessed on the local host.
### localdemo
Demo configuration. Boots a complete Arvados environment inside the container.
Unlike the development configuration, code directories are included in the demo
image, and data directories are stored in a separate data volume container.
Services are bound to the Docker container's network IP address and can only be
-access on the local host.
+accessed on the local host.
### test
Run the test suite.
@@ -50,13 +50,16 @@ Run the test suite.
### publicdev
Publicly accessible development configuration. Similar to 'dev' except that
service ports are published to the host's IP address and can accessed by anyone
-who can connect to the host system.
+who can connect to the host system. WARNING! The public arvbox configuration
+is NOT SECURE and must not be placed on a public IP address or used for
+production work.
### publicdemo
Publicly accessible development configuration. Similar to 'localdemo' except
that service ports are published to the host's IP address and can accessed by
-anyone who can connect to the host system.
-
+anyone who can connect to the host system. WARNING! The public arvbox configuration
+is NOT SECURE and must not be placed on a public IP address or used for
+production work.
## Environment variables
diff --git a/arvbox/lib/arvbox/docker/Dockerfile.demo b/arvbox/lib/arvbox/docker/Dockerfile.demo
index 1085abc..d40cd5c 100644
--- a/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -5,6 +5,7 @@ RUN cd /usr/src && \
git clone https://github.com/curoverse/sso-devise-omniauth-provider.git sso
RUN chown -R 1000:1000 /usr/src && /usr/local/lib/arvbox/createusers.sh
+RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql
RUN sudo -u arvbox /usr/local/lib/arvbox/service/sso/run-service --only-deps
RUN sudo -u arvbox /usr/local/lib/arvbox/service/api/run-service --only-deps
commit 98cf9d2823a2428d5d3d4eb00b3e07e7c3528121
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 18 16:43:50 2016 -0500
Tweak formatting
diff --git a/arvbox/README.md b/arvbox/README.md
index c50a547..3537119 100644
--- a/arvbox/README.md
+++ b/arvbox/README.md
@@ -26,10 +26,10 @@ log <service> tail log of specified service
svrestart <service> restart specified service inside arvbox
clone <from> <to> clone an arvbox
-## Configs
-* dev
+## Configs
+### dev
Development configuration. Boots a complete Arvados environment inside the
container. The "arvados", "arvado-dev" and "sso" code directories along data
directories "postresql", "var", "passenger" and "gems" are bind mounted from
@@ -37,60 +37,58 @@ the host file system for easy access and persistence across container rebuilds.
Services are bound to the Docker container's network IP address and can only be
access on the local host.
-* localdemo
-
+### localdemo
Demo configuration. Boots a complete Arvados environment inside the container.
Unlike the development configuration, code directories are included in the demo
image, and data directories are stored in a separate data volume container.
Services are bound to the Docker container's network IP address and can only be
access on the local host.
-* test
-
+### test
Run the test suite.
-* publicdev
-
+### publicdev
Publicly accessible development configuration. Similar to 'dev' except that
service ports are published to the host's IP address and can accessed by anyone
who can connect to the host system.
-* publicdemo
-
+### publicdemo
Publicly accessible development configuration. Similar to 'localdemo' except
that service ports are published to the host's IP address and can accessed by
anyone who can connect to the host system.
+
## Environment variables
-ARVBOX_DOCKER
+### ARVBOX_DOCKER
The location of Dockerfile.base and associated files used by "arvbox build".
default: result of $(readlink -f $(dirname $0)/../lib/arvbox/docker)
-ARVBOX_CONTAINER
+### ARVBOX_CONTAINER
The name of the Docker container to manipulate.
default: arvbox
-ARVBOX_BASE
+### ARVBOX_BASE
The base directory to store persistent data for arvbox containers.
default: $HOME/.arvbox
-ARVBOX_DATA
+### ARVBOX_DATA
The base directory to store persistent data for the current container.
default: $ARVBOX_BASE/$ARVBOX_CONTAINER
-ARVADOS_ROOT
+### ARVADOS_ROOT
The root directory of the Arvados source tree
default: $ARVBOX_DATA/arvados
-ARVADOS_DEV_ROOT
+### ARVADOS_DEV_ROOT
The root directory of the Arvados-dev source tree
default: $ARVBOX_DATA/arvados-dev
-SSO_ROOT
+### SSO_ROOT
The root directory of the SSO source tree
default: $ARVBOX_DATA/sso-devise-omniauth-provider
+
## Notes
Services are designed to install and auto-configure on start or restart. For
commit 2ea94dd246e2124720f810c6dad6a25d941ebd62
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Mon Jan 18 16:42:05 2016 -0500
8080: Add more documentation about different configurations
diff --git a/arvbox/README b/arvbox/README.md
similarity index 57%
rename from arvbox/README
rename to arvbox/README.md
index d8179bc..c50a547 100644
--- a/arvbox/README
+++ b/arvbox/README.md
@@ -1,14 +1,12 @@
-Arvados-in-a-box
-
-Development and demonstration environment for Arvados.
+# Arvados-in-a-box
+Self-contained development, demonstration and testing environment for Arvados.
-Quick start:
+## Quick start
-$ ./bin/arvbox reboot dev
+$ ./bin/arvbox reboot localdemo
-
-Usage:
+## Usage
Arvados-in-a-box
@@ -28,20 +26,42 @@ log <service> tail log of specified service
svrestart <service> restart specified service inside arvbox
clone <from> <to> clone an arvbox
+## Configs
-Notes:
+* dev
-Services are designed to install and auto-configure on start or restart. For
-example, the service script for keepstore always compiles keepstore from source
-and registers the daemon with the API server.
+Development configuration. Boots a complete Arvados environment inside the
+container. The "arvados", "arvado-dev" and "sso" code directories along data
+directories "postresql", "var", "passenger" and "gems" are bind mounted from
+the host file system for easy access and persistence across container rebuilds.
+Services are bound to the Docker container's network IP address and can only be
+access on the local host.
-Services are run with process supervision, so a service which exits will be
-restarted. Dependencies between services are handled by repeatedly trying and
-failing the service script until dependencies are fulfilled (by other service
-scripts) enabling the service script to complete.
+* localdemo
+
+Demo configuration. Boots a complete Arvados environment inside the container.
+Unlike the development configuration, code directories are included in the demo
+image, and data directories are stored in a separate data volume container.
+Services are bound to the Docker container's network IP address and can only be
+access on the local host.
+
+* test
+
+Run the test suite.
+* publicdev
-Environment variables:
+Publicly accessible development configuration. Similar to 'dev' except that
+service ports are published to the host's IP address and can accessed by anyone
+who can connect to the host system.
+
+* publicdemo
+
+Publicly accessible development configuration. Similar to 'localdemo' except
+that service ports are published to the host's IP address and can accessed by
+anyone who can connect to the host system.
+
+## Environment variables
ARVBOX_DOCKER
The location of Dockerfile.base and associated files used by "arvbox build".
@@ -70,3 +90,14 @@ default: $ARVBOX_DATA/arvados-dev
SSO_ROOT
The root directory of the SSO source tree
default: $ARVBOX_DATA/sso-devise-omniauth-provider
+
+## Notes
+
+Services are designed to install and auto-configure on start or restart. For
+example, the service script for keepstore always compiles keepstore from source
+and registers the daemon with the API server.
+
+Services are run with process supervision, so a service which exits will be
+restarted. Dependencies between services are handled by repeatedly trying and
+failing the service script until dependencies are fulfilled (by other service
+scripts) enabling the service script to complete.
diff --git a/arvbox/bin/arvbox b/arvbox/bin/arvbox
index 73c3803..3d58315 100755
--- a/arvbox/bin/arvbox
+++ b/arvbox/bin/arvbox
@@ -351,7 +351,7 @@ case "$subcmd" in
*)
echo "Arvados-in-a-box"
echo
- echo "$0 (build|start|run|open|shell|ip|stop|reboot|reset|destroy|log|svrestart)"
+ echo "$(basename $0) (build|start|run|open|shell|ip|stop|reboot|reset|destroy|log|svrestart)"
echo
echo "build <config> build arvbox Docker image"
echo "start|run <config> start $ARVBOX_CONTAINER container"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list