[ARVADOS] updated: 30e420e6cc547a12f2a775188f0429b3607da6c3

[git at public.curoverse.com]

Summary of changes:
 docker/api/Dockerfile                              |   4 +-
 .../api/application.yml.in                         |  13 +-
 docker/api/passenger.conf                          |   4 +-
 docker/api/production.rb.in                        | 100 ------
 docker/api/secret_token.rb.in                      |  12 -
 docker/arvdock                                     | 336 +++++++++++----------
 docker/build_tools/Makefile                        |  34 +--
 docker/build_tools/build.rb                        |  29 +-
 docker/keep/Dockerfile                             |  14 +
 docker/mkimage-debootstrap.sh                      |  18 +-
 docker/sso/passenger.conf                          |   4 +-
 docker/warehouse/Dockerfile                        |  28 --
 docker/warehouse/supervisor.conf                   |   3 -
 docker/warehouse/warehouse.conf.in                 |  12 -
 docker/workbench/Dockerfile                        |   5 +-
 docker/workbench/apache2_foreground.sh             |   5 +
 .../workbench/application.yml.in                   |  15 +-
 docker/workbench/passenger.conf                    |   4 +-
 18 files changed, 272 insertions(+), 368 deletions(-)
 copy services/api/config/application.yml.example => docker/api/application.yml.in (78%)
 delete mode 100644 docker/api/production.rb.in
 delete mode 100644 docker/api/secret_token.rb.in
 create mode 100644 docker/keep/Dockerfile
 delete mode 100644 docker/warehouse/Dockerfile
 delete mode 100644 docker/warehouse/supervisor.conf
 delete mode 100644 docker/warehouse/warehouse.conf.in
 copy apps/workbench/config/application.yml.example => docker/workbench/application.yml.in (60%)

       via  30e420e6cc547a12f2a775188f0429b3607da6c3 (commit)
       via  87a7a3fbb7cf5231fdcdcd72bc3199dc15f95b71 (commit)
       via  9b9ceec0908bdf769109d4df73b3afe1e693c631 (commit)
       via  659ce826d7e04bab793a4a3ab67dcd38cf98326d (commit)
       via  d7c0d242bb848613d5814966162b1c8d298d644d (commit)
       via  4af484d2c161fe75266bef6c43325a44cd3e0afd (commit)
       via  295882a5097a938c1192e933afafb98ef39564fe (commit)
       via  6bc625cbc09a69ca4d9379894d463b9c021f5ec0 (commit)
       via  b5352280e200fcecc39a8705151a0a3eb6be6e81 (commit)
       via  59fcc702a3394a53f3fc36c71e24454d8fd647be (commit)
       via  756c42a9b68e7d826c30402f9bcaba3a56260848 (commit)
       via  c1bcfda11a5d439bf6e9eabf10ed360e917f0d43 (commit)
       via  479724c95e77bb9b950879f0d90399e0abf56ddc (commit)
       via  6de4e2d16c3288ddda96fff8a8bc2b757e5765d7 (commit)
      from  fcb35ed42449c5ad58cd9ec62ff2ed353cf9d940 (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 30e420e6cc547a12f2a775188f0429b3607da6c3
Merge: fcb35ed 87a7a3f
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Jun 30 15:14:39 2014 -0400

    Merge branch '3118-docker-fixes'
    
    refs #3118


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


hooks/post-receive
--