[ARVADOS] updated: 97f3ab858482c9d68972fa0fe3cb887d7968fcc7
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 22 14:20:49 EDT 2014
Summary of changes:
doc/install/install-docker.html.textile.liquid | 86 +++++++++++++++-----------
docker/arvdock | 12 ++--
docker/build_tools/Makefile | 4 +-
3 files changed, 56 insertions(+), 46 deletions(-)
via 97f3ab858482c9d68972fa0fe3cb887d7968fcc7 (commit)
via 18717f2285dfc992720f6d9eb1f3af0bba267916 (commit)
from 564a719cc8bb9abd6684ad1d60e73a66be2901a2 (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 97f3ab858482c9d68972fa0fe3cb887d7968fcc7
Author: Ward Vandewege <ward at curoverse.com>
Date: Tue Jul 22 14:18:35 2014 -0400
* Update docs to reflect that crunch is now supported.
* Rename --mrproper to --deepclean
refs #3219
diff --git a/doc/install/install-docker.html.textile.liquid b/doc/install/install-docker.html.textile.liquid
index cb27c97..31342e5 100644
--- a/doc/install/install-docker.html.textile.liquid
+++ b/doc/install/install-docker.html.textile.liquid
@@ -4,7 +4,12 @@ navsection: installguide
title: Installing with Docker
...
-h2. Prerequisites:
+h2. Purpose
+
+This installation method is appropriate for local testing, evaluation, and
+development. For production use, this method is not recommended.
+
+h2. Prerequisites
# A GNU/Linux (virtual) machine
# A working Docker installation (see "Installing Docker":https://docs.docker.com/installation/)
@@ -43,40 +48,38 @@ Then build the docker containers (this will take a while):
<pre><code>
~$ <span class="userinput">./build.sh</span>
...
- ---> 05f0ae429530
-Step 9 : ADD apache2_foreground.sh /etc/apache2/foreground.sh
- ---> 7292b241305a
-Step 10 : CMD ["/etc/apache2/foreground.sh"]
- ---> Running in 82d59061ead8
- ---> 72cee36a9281
-Successfully built 72cee36a9281
-Removing intermediate container 2bc8c98c83c7
-Removing intermediate container 9457483a59cf
-Removing intermediate container 7cc5723df67c
-Removing intermediate container 5cb2cede73de
-Removing intermediate container 0acc147a7f6d
-Removing intermediate container 82d59061ead8
-Removing intermediate container 9c022a467396
-Removing intermediate container 16044441463f
-Removing intermediate container cffbbddd82d1
-date >sso-image
+Step 7 : ADD generated/setup.sh /usr/local/bin/setup.sh
+ ---> d7c0e7fdf7ab
+Removing intermediate container f3d81180795d
+Step 8 : CMD ["/usr/bin/supervisord", "-n"]
+ ---> Running in 84c64cb9f0d5
+ ---> d6cbb5002604
+Removing intermediate container 84c64cb9f0d5
+Successfully built d6cbb5002604
+date >shell-image
</code></pre></notextile>
If all goes well, you should now have a number of docker images built:
<notextile>
<pre><code>~$ <span class="userinput">docker.io images</span>
-REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
-arvados/sso latest 72cee36a9281 11 seconds ago 1.727 GB
-arvados/keep latest c3842f856bcb 56 seconds ago 210.6 MB
-arvados/workbench latest b91aa980597c About a minute ago 2.07 GB
-arvados/doc latest 050e9e6b8213 About a minute ago 1.442 GB
-arvados/api latest 79843d0a8997 About a minute ago 2.112 GB
-arvados/passenger latest 2342a550da7f 2 minutes ago 1.658 GB
-arvados/base latest 68caefd8ea5b 5 minutes ago 1.383 GB
-arvados/debian 7.5 6e32119ffcd0 8 minutes ago 116.8 MB
-arvados/debian latest 6e32119ffcd0 8 minutes ago 116.8 MB
-arvados/debian wheezy 6e32119ffcd0 8 minutes ago 116.8 MB
+REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
+arvados/shell latest d6cbb5002604 10 minutes ago 1.613 GB
+arvados/sso latest 377f1fa0108e 11 minutes ago 1.807 GB
+arvados/keep latest ade0e0d2dd00 12 minutes ago 210.8 MB
+arvados/workbench latest b0e4fb6da385 12 minutes ago 2.218 GB
+arvados/doc latest 4b64daec9454 12 minutes ago 1.524 GB
+arvados/compute latest 7f1f5f7faf54 13 minutes ago 1.862 GB
+arvados/slurm latest f5bfd1008e6b 17 minutes ago 1.573 GB
+arvados/api latest 6b93c5f5fc42 17 minutes ago 2.274 GB
+arvados/passenger latest add2d11fdf24 18 minutes ago 1.738 GB
+arvados/base latest 81eaadd0c6f5 22 minutes ago 1.463 GB
+arvados/debian 7.6 f339ce275c01 6 days ago 116.8 MB
+arvados/debian latest f339ce275c01 6 days ago 116.8 MB
+arvados/debian wheezy f339ce275c01 6 days ago 116.8 MB
+crosbymichael/skydock latest e985023521f6 3 months ago 510.7 MB
+crosbymichael/skydns next 79c99a4608ed 3 months ago 525 MB
+crosbymichael/skydns latest 1923ce648d4c 5 months ago 137.5 MB
</code></pre></notextile>
h2. Updating the Arvados Docker containers
@@ -87,12 +90,18 @@ If there has been an update to the Arvados Docker building code, it is safest to
<pre><code>~$ <span class="userinput">./build.sh --clean</span></code></pre>
</notextile>
-You can also use '--realclean', which does what '--clean' does and in addition removes all Arvados Docker containers and images from your system.
+You can also use '--realclean', which does what '--clean' does and in addition removes all Arvados Docker containers and images from your system, with the exception of the arvados/debian image.
<notextile>
<pre><code>~$ <span class="userinput">./build.sh --realclean</span></code></pre>
</notextile>
+Finally, the '--deepclean' option does what '--realclean' does, and also removes the arvados/debian image.
+
+<notextile>
+<pre><code>~$ <span class="userinput">./build.sh --deepclean</span></code></pre>
+</notextile>
+
h2. Running the Arvados Docker containers
The @arvdock@ command can be used to start and stop the docker containers. It has a number of options:
@@ -104,13 +113,16 @@ The @arvdock@ command can be used to start and stop the docker containers. It ha
usage: ./arvdock (start|stop|restart|test) [options]
./arvdock start/stop/restart options:
- -d [port], --doc[=port] Documentation server (default port 9898)
- -w [port], --workbench[=port] Workbench server (default port 9899)
- -s [port], --sso[=port] SSO server (default port 9901)
- -a [port], --api[=port] API server (default port 9900)
- -k, --keep Keep servers
- --ssh Enable SSH access to server containers
- -h, --help Display this help and exit
+ -d[port], --doc[=port] Documentation server (default port 9898)
+ -w[port], --workbench[=port] Workbench server (default port 9899)
+ -s[port], --sso[=port] SSO server (default port 9901)
+ -a[port], --api[=port] API server (default port 9900)
+ -c, --compute Compute nodes (starts 2)
+ -v, --vm Shell server
+ -n, --nameserver Nameserver
+ -k, --keep Keep servers
+ --ssh Enable SSH access to server containers
+ -h, --help Display this help and exit
If no options are given, the action is applied to all servers.
diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 7b1565a..346b5c5 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -17,9 +17,9 @@ realclean: clean
-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
-$(DOCKER) rmi `$(DOCKER) images -q arvados/* |grep -v $(DEBIAN_IMAGE)`
-# `make mrproper' will remove all Arvados docker images and force
+# `make deepclean' will remove all Arvados docker images and force
# subsequent makes to build the entire chain from the ground up
-mrproper: clean
+deepclean: clean
-rm debian-arvados-image
-[ -n "`$(DOCKER) ps -q`" ] && $(DOCKER) stop `$(DOCKER) ps -q`
-$(DOCKER) rm `$(DOCKER) ps -a |grep -e arvados -e api_server -e keep_server -e doc_server -e workbench_server |cut -f 1 -d' '`
commit 18717f2285dfc992720f6d9eb1f3af0bba267916
Author: Ward Vandewege <ward at curoverse.com>
Date: Mon Jul 21 16:20:18 2014 -0400
arvdock starts 2 compute nodes, always.
refs #3219
diff --git a/docker/arvdock b/docker/arvdock
index 18472cf..17b63b8 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -18,7 +18,7 @@ function usage {
echo >&2 " -w[port], --workbench[=port] Workbench server (default port 9899)"
echo >&2 " -s[port], --sso[=port] SSO server (default port 9901)"
echo >&2 " -a[port], --api[=port] API server (default port 9900)"
- echo >&2 " -c[count], --compute[=count] Compute nodes (default starts 2)"
+ echo >&2 " -c, --compute Compute nodes (starts 2)"
echo >&2 " -v, --vm Shell server"
echo >&2 " -n, --nameserver Nameserver"
echo >&2 " -k, --keep Keep servers"
@@ -152,8 +152,8 @@ function do_start {
local start_keep=false
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
- local TEMP=`getopt -o d::s::a::c::w::nkvh \
- --long doc::,sso::,api::,compute::,workbench::,nameserver,keep,vm,help,ssh \
+ local TEMP=`getopt -o d::s::a::cw::nkvh \
+ --long doc::,sso::,api::,compute,workbench::,nameserver,keep,vm,help,ssh \
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@ -183,10 +183,8 @@ function do_start {
esac
;;
-c | --compute)
- case "$2" in
- "") start_compute=2; shift 2 ;;
- *) start_compute=$2; shift 2 ;;
- esac
+ start_compute=2
+ shift
;;
-w | --workbench)
case "$2" in
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list