[ARVADOS] updated: 5c1410e60eb06769207dbafd77501bf2fa45a29b

Git user git at public.curoverse.com
Mon Mar 28 09:37:48 EDT 2016


Summary of changes:
 .../pipeline_instances/_running_component.html.erb | 10 ------
 build/run-build-docker-jobs-image.sh               | 38 ++++++++++----------
 build/run-build-packages-one-target.sh             |  4 +--
 build/run-build-packages.sh                        | 24 +++++++------
 docker/build_tools/Makefile                        |  2 +-
 docker/jobs/Dockerfile                             |  7 ++--
 .../v1/api_client_authorizations_controller.rb     | 33 +++++++++++++-----
 .../app/controllers/arvados/v1/jobs_controller.rb  |  4 +--
 services/api/app/models/job.rb                     | 13 +++----
 .../api_client_authorizations_controller_test.rb   | 40 +++++++++++++++++-----
 services/api/test/unit/job_test.rb                 |  1 -
 services/fuse/arvados_fuse/fusefile.py             |  6 ++++
 services/keepstore/azure_blob_volume.go            |  2 +-
 .../arvnodeman/computenode/dispatch/slurm.py       | 14 ++------
 14 files changed, 114 insertions(+), 84 deletions(-)

       via  5c1410e60eb06769207dbafd77501bf2fa45a29b (commit)
       via  0e32c4ee6281dd4a3ae186b75dd7c94c8be508c8 (commit)
       via  adad241671bd37f76b5dcefad1e01914f9797214 (commit)
       via  087ad4d01176703f22fde4cf053427e562890c16 (commit)
       via  6c01579495dd6a26ee9b05aa0accd136094d453e (commit)
       via  a810fa495eab5bc3356ac53a9a3aa40d69b1c77e (commit)
       via  32fba9fa61361bf068e8125507e6242da4295ee5 (commit)
       via  abd7a5952a3e852c854e3e08353b42b778a7381d (commit)
       via  91b6e4f4ae93850fb3cc38cf8566115a66f44b27 (commit)
       via  48fce933fec998722e669d7d33a62f3c0a10b05e (commit)
       via  f49a4d7ff243bb3e8b15f4c5adf77d6355fb6bcd (commit)
       via  c7539c212173e4ce103ec8cc893f0c4f0a942ba3 (commit)
       via  d27d9df7bfb7be820b4674675a240901348cfadb (commit)
       via  a3d43ada117ee7e0535579fc3f1b66503f95b4c7 (commit)
       via  4447bfa5edac893079894484244318a872a0d3ba (commit)
       via  1b7ac33e0651087b85f8583c72325d5583b98776 (commit)
       via  7bf10f8b9d2246a9144ef1322e102fe227c7362e (commit)
       via  3e50cdc0ff3c5c8d40d082bf99a43eae3682aa72 (commit)
       via  354ab6f297bb2100b6ebd0c94fa6463a77d18844 (commit)
      from  525e930dcb35b440424d53b09a9788fd8726b781 (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 5c1410e60eb06769207dbafd77501bf2fa45a29b
Merge: 525e930 0e32c4e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Mar 28 09:37:37 2016 -0400

    Merge branch 'master' into 8654-arv-jobs-cwl-runner
    
    Conflicts:
    	docker/jobs/Dockerfile

diff --cc docker/jobs/Dockerfile
index bbe7844,30c2416..d80c3a8
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@@ -6,13 -6,14 +6,14 @@@ ENV DEBIAN_FRONTEND noninteractiv
  
  ADD apt.arvados.org.list /etc/apt/sources.list.d/
  RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
  
- RUN apt-get update -q && apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev nodejs python-arvados-cwl-runner
+ ARG COMMIT=latest
+ RUN echo $COMMIT && apt-get update -q
  
- RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
 -RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev
++RUN apt-get install -qy git python-pip python-virtualenv python-arvados-python-client python-dev libcurl4-gnutls-dev nodejs python-arvados-cwl-runner
  
  # Install dependencies and set up system.
- # The FUSE packages help ensure that we can install the Python SDK (arv-mount).
  RUN /usr/sbin/adduser --disabled-password \
        --gecos 'Crunch execution user' crunch && \
      /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list