[ARVADOS] updated: 272eef11358d08c026ae68df71d0ff04e5faf990

git at public.curoverse.com git at public.curoverse.com
Tue May 6 10:17:04 EDT 2014


Summary of changes:
 .../api_client_authorizations_controller.rb        |    2 +-
 .../app/controllers/application_controller.rb      |   85 ++++++++++----
 .../app/controllers/collections_controller.rb      |   76 +++++++++++-
 apps/workbench/app/models/arvados_api_client.rb    |   30 +++--
 apps/workbench/app/models/arvados_resource_list.rb |   36 ++++++-
 apps/workbench/app/models/group.rb                 |   10 +-
 apps/workbench/app/models/user.rb                  |    5 -
 .../test/functional/collections_controller_test.rb |  130 ++++++++++++++++++++
 .../test/unit/arvados_resource_list_test.rb        |   55 ++++++++
 apps/workbench/test/unit/group_test.rb             |   29 ++++-
 apps/workbench/test/unit/user_test.rb              |   12 --
 doc/api/methods/groups.html.textile.liquid         |   26 ++--
 doc/api/methods/users.html.textile.liquid          |   12 --
 doc/install/client.html.textile.liquid             |   43 +-------
 doc/sdk/python/sdk-python.html.textile.liquid      |    4 +
 docker/build_tools/Makefile                        |    8 +-
 docker/jobs/Dockerfile                             |    8 +-
 services/api/Gemfile                               |    3 +
 services/api/Gemfile.lock                          |    4 +
 .../api/app/controllers/application_controller.rb  |   32 +++---
 services/api/app/models/arvados_model.rb           |  104 +++++++++++-----
 services/api/app/models/link.rb                    |   11 ++
 services/api/app/models/node.rb                    |    2 +-
 services/api/config/routes.rb                      |    3 +-
 ...0140501165548_add_unique_name_index_to_links.rb |   13 ++
 services/api/db/schema.rb                          |    6 +-
 services/api/lib/current_api_client.rb             |    4 +-
 services/api/lib/load_param.rb                     |    2 +-
 services/api/test/fixtures/api_clients.yml         |    2 +
 services/api/test/fixtures/groups.yml              |   22 +++-
 services/api/test/fixtures/links.yml               |   52 +++++++-
 services/api/test/fixtures/repositories.yml        |    4 +-
 services/api/test/fixtures/specimens.yml           |   12 +-
 .../arvados/v1/groups_controller_test.rb           |   92 +++++++++++++-
 .../functional/arvados/v1/links_controller_test.rb |   13 ++
 .../functional/arvados/v1/users_controller_test.rb |   76 ------------
 services/api/test/unit/group_test.rb               |   61 +++++++++-
 services/api/test/unit/link_test.rb                |   47 +++++++-
 services/keep/src/keep/perms.go                    |  104 ++++++++++++++++
 services/keep/src/keep/perms_test.go               |  104 ++++++++++++++++
 40 files changed, 1043 insertions(+), 301 deletions(-)
 create mode 100644 apps/workbench/test/unit/arvados_resource_list_test.rb
 create mode 100644 services/api/db/migrate/20140501165548_add_unique_name_index_to_links.rb
 create mode 100644 services/keep/src/keep/perms.go
 create mode 100644 services/keep/src/keep/perms_test.go

       via  272eef11358d08c026ae68df71d0ff04e5faf990 (commit)
       via  ea5dd0702fecfabaa9ee9691f7ff6d69093630c8 (commit)
       via  f8ba79b88683be984913e28677c4522ca21019aa (commit)
       via  06c00e72091d7c058cbc607ed863a9444d26156c (commit)
       via  7fc412308bcb4d853e6f9aeb9e7d45e5ab76b11f (commit)
       via  58242491cbdb85f19342a2ca04b499b9bed98a2d (commit)
       via  5845d196105cc4676847695833b7ef3658c8a180 (commit)
       via  d8de76141cbe9a9af10dfc408b6d656cc727bbe5 (commit)
       via  6b21bd450e8b8ed968a965290e641a75660cd695 (commit)
       via  8370640cef5110b65ba6c3a2bf9d7f56541b4c7f (commit)
       via  e76d4b556f07bbeab0998ca0332dad187bb119ee (commit)
       via  5af51b564ca9d805f8e61b4bb3c37ed813b3bd16 (commit)
       via  8dbf8bd4d53c200ca81494556326c03abae74581 (commit)
       via  3398985fa7f0997c225b55efaa97dc000a8234fa (commit)
       via  5ab27a2c4889609669f6b04bd9dfd2e403e43441 (commit)
       via  256142bddd532e2834b4e7f79c3146009e23059e (commit)
       via  c47ada5e06a91a0283bd779d17ad7e6403e1c223 (commit)
       via  77f1f9eb6f2d03b53c0bb4567ef07718b934e8ea (commit)
       via  395b4e72d33c5b4df931c029a45870d354c32312 (commit)
       via  546687a7c95109a57efdf7cecbc3f795bc3e72f1 (commit)
       via  76e20e694fbe708e17e57a2e0b1c36aca6e8d7d0 (commit)
       via  4e05647f7a5b3971771c5a928634c6b2a41aa591 (commit)
       via  10d03fd3b09ec9f2eaea62cc665a1022f3744b89 (commit)
       via  3ea6744bcf9cc4812ab24913286c3bc8e123b76a (commit)
       via  af3a38d81374f70d15134813563b7371e8e4127c (commit)
       via  8c5b4f6d87cec17f915802e3c5f14695611eba7f (commit)
       via  aeff59bfaf199eec6884ccf3ff60968bec81f581 (commit)
       via  8023ae393e2c9ce115bf67bbcf632798a3d17b87 (commit)
       via  bcc477ed88c04b3200a70d16f1fc99da11c670f8 (commit)
       via  2bb2789ff129b4112d81ba343fadfb7ad362ecd1 (commit)
       via  1c9ae7e8c8d7920602250958333751b769fb3a72 (commit)
       via  b93c1cd880d8367d11bd3fd7574e55f4545a34c5 (commit)
       via  ccce5e8ad71ed2e50ecd57c0f73f1aaafc468539 (commit)
       via  70fddd1f7cacaa0db92b3b76a0baeeddf6f0d9b6 (commit)
       via  83dcc2c95eeb38c6b0f6f7509338aa729f14d762 (commit)
       via  3bd5f6c3f353059c15eeea51b16b2fdee694d504 (commit)
       via  6a53a3c5d97d33586567f8df082a725f7d229327 (commit)
       via  da67c81ff6cc5fd540c0725de1c8208c2d8933be (commit)
       via  9cfbcdf804974812b1a4ec514f5dc7902fce6137 (commit)
       via  34350a8b802a8c48b534673a712614d36a5b97ac (commit)
       via  d649a716392760cd394e18a628dc23aaec5fa3b3 (commit)
       via  50b746d9246c19c1ad2cf506bb18a0eb8ddd0755 (commit)
       via  520d80f58ab4358dfce0233fe6880794c819760c (commit)
       via  f8cc86219281026b2867c543524f8e7fa23da291 (commit)
      from  ce4343f8fcd34d0b172af889407a757efc86b5ec (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 272eef11358d08c026ae68df71d0ff04e5faf990
Author: Brett Smith <brett at curoverse.com>
Date:   Tue May 6 10:17:42 2014 -0400

    docker: Don't set up FUSE inside arvados/jobs.
    
    Now that we expect crunch-job to expose the Keep mount to containers
    as a volume, there's no general need to make FUSE mounts from inside
    the container.  This commit removes that setup from the image, which
    makse the build process a lot less hairy.

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 82888ad..69db746 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -132,13 +132,7 @@ doc-image: base-image $(BUILD) $(DOC_DEPS)
 	date >doc-image
 
 jobs-image: base-image $(BUILD) $(JOBS_DEPS)
-	$(DOCKER_BUILD) -t arvados/jobswofuse jobs
-	docker run --privileged --name jobsaddfuse --user root \
-	  arvados/jobswofuse /bin/sh -c \
-	    "/bin/mknod -m 0660 /dev/fuse c 10 229 && \
-	     /bin/chown root:fuse /dev/fuse"
-	docker commit --run='{"User": "crunch"}' jobsaddfuse arvados/jobs
-	docker rm jobsaddfuse
+	$(DOCKER_BUILD) -t arvados/jobs jobs
 	date >jobs-image
 
 workbench-image: passenger-image $(BUILD) $(WORKBENCH_DEPS)
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index e3fdd18..28ef858 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -1,18 +1,14 @@
-# After you build this image, you should do a privileged run to make /dev/fuse.
-# See the jobs-image recipe in docker/build_tools/Makefile.
-
 FROM arvados/base
 MAINTAINER Brett Smith <brett at curoverse.com>
 
 # Install dependencies and set up system.
+# The FUSE packages help ensure that we can install the Python SDK (arv-mount).
 RUN /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \
       libio-socket-ssl-perl libjson-perl liburi-perl libwww-perl \
       fuse libattr1-dev libfuse-dev && \
     /usr/sbin/adduser --disabled-password \
       --gecos 'Crunch execution user' crunch && \
-    /usr/sbin/adduser crunch fuse && \
     /usr/bin/install -d -o crunch -g crunch -m 0700 /tmp/crunch-job && \
-    /bin/ln -s /proc/mounts /etc/mtab && \
     /bin/ln -s /usr/src/arvados /usr/local/src/arvados
 
 # Install Arvados packages.
@@ -20,3 +16,5 @@ RUN find /usr/src/arvados/sdk -name '*.gem' -print0 | \
       xargs -0rn 1 gem install && \
     cd /usr/src/arvados/sdk/python && \
     python setup.py install
+
+USER crunch

commit ea5dd0702fecfabaa9ee9691f7ff6d69093630c8
Merge: ce4343f f8ba79b
Author: Brett Smith <brett at curoverse.com>
Date:   Tue May 6 09:38:00 2014 -0400

    Merge branch 'master' into 2492-docker-crunch-jobs


-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list