[ARVADOS] updated: e94c1f08e958ed96d7cd153ea4668baed35961ed

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  e94c1f08e958ed96d7cd153ea4668baed35961ed (commit)
       via  38ad14c0cb5e400e66904a4af1c432f46df8a170 (commit)
      from  7719a08f3cdcc3a7e3468a26e6f49c849061a42d (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 e94c1f08e958ed96d7cd153ea4668baed35961ed
Merge: 7719a08 38ad14c
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Jul 15 16:14:56 2016 -0400

    Merge branch '9459-arvbox-demo-version-arg-wip'
    
    Refs #9459.  Closes #9531.


commit 38ad14c0cb5e400e66904a4af1c432f46df8a170
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jun 30 17:45:12 2016 -0400

    9459: arvbox-demo accepts version arguments for Git checkouts.

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index a04c06d..57105ea 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -1,8 +1,12 @@
 FROM arvados/arvbox-base
+ARG arvados_version=master
+ARG sso_version=master
 
 RUN cd /usr/src && \
-    git clone https://github.com/curoverse/arvados.git && \
-    git clone https://github.com/curoverse/sso-devise-omniauth-provider.git sso
+    git clone --no-checkout https://github.com/curoverse/arvados.git && \
+    git -C arvados checkout ${arvados_version} && \
+    git clone --no-checkout https://github.com/curoverse/sso-devise-omniauth-provider.git sso && \
+    git -C sso checkout ${sso_version}
 
 ADD service/ /var/lib/arvbox/service
 RUN rmdir /etc/service && ln -sf /var/lib/arvbox/service /etc

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


hooks/post-receive
--